Index: /branches/HTM-6.2-dev0/source/Lib/TLibCommon/TypeDef.h
===================================================================
--- /branches/HTM-6.2-dev0/source/Lib/TLibCommon/TypeDef.h	(revision 427)
+++ /branches/HTM-6.2-dev0/source/Lib/TLibCommon/TypeDef.h	(revision 428)
@@ -206,9 +206,8 @@
 
 
-#define FIX_MERGE_D                          1 // Fix for merge
-#define MERL_General_Fix                     1 // General fix by MERL
-
-
-
+#define FIX_MERGE_D                          1 // Fix to compile merged version
+
+
+#define MERL_General_Fix                     0 // General fix by MERL
 #define MERL_VSP_C0152_BugFix_ForNoDepthCase 1 // MERL bugfix for test condition of no depth
 #define QC_BVSP_CleanUP_D0191                    1