diff --git a/4_Trunk/MCAL-v4h-1_19.3.0.D_release/rel/V4H/common_family/make/arm/SampleApp.bat b/4_Trunk/MCAL-v4h-1_19.3.0.D_release/rel/V4H/common_family/make/arm/SampleApp.bat
index 67c3ee9..ad5538f 100644
--- a/4_Trunk/MCAL-v4h-1_19.3.0.D_release/rel/V4H/common_family/make/arm/SampleApp.bat
+++ b/4_Trunk/MCAL-v4h-1_19.3.0.D_release/rel/V4H/common_family/make/arm/SampleApp.bat
@@ -53,7 +53,15 @@ SET CPU2_OPTION=CPU2_NOT_USED
 SET CPU3_OPTION=CPU3_NOT_USED
 
 IF "%COMPILER_INSTALL_DIR%"=="" (
+<<<<<<< HEAD
 SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.2\bin
+=======
+<<<<<<< HEAD
+SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.1\bin
+=======
+SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.2\bin
+>>>>>>> 62b20d068d0206dc5ca77386834dfa6324766226
+>>>>>>> 84cc68d38b16020cdab5248a1adf75a6a3ef1d08
 )
 
 IF /i "%1"=="DisplEnv" (
diff --git a/4_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/SampleApp.bat b/4_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/SampleApp.bat
index 85bd2ac..ed50958 100644
--- a/4_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/SampleApp.bat
+++ b/4_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/SampleApp.bat
@@ -53,7 +53,15 @@ SET CPU2_OPTION=CPU2_NOT_USED
 SET CPU3_OPTION=CPU3_NOT_USED
 
 IF "%COMPILER_INSTALL_DIR%"=="" (
+<<<<<<< HEAD
 SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.1\bin
+=======
+<<<<<<< HEAD
+SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.2\bin
+=======
+SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.1\bin
+>>>>>>> 62b20d068d0206dc5ca77386834dfa6324766226
+>>>>>>> 84cc68d38b16020cdab5248a1adf75a6a3ef1d08
 )
 
 IF /i "%1"=="DisplEnv" (