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 301e5a4..afbd2e8 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
@@ -1,4 +1,4 @@
-@echo off_test
+@echo off
 setlocal EnableDelayedExpansion
 set Filename=%~n0
 
@@ -53,15 +53,7 @@ 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" (