diff --git a/RKBOOT/RK3308MINIALL.ini b/RKBOOT/RK3308MINIALL.ini
index 8e22dd8b..61d50331 100755
--- a/RKBOOT/RK3308MINIALL.ini
+++ b/RKBOOT/RK3308MINIALL.ini
@@ -14,14 +14,7 @@ Path1=bin/rk33/rk3308_usbplug_v1.03.bin
 NUM=2
 LOADER1=FlashData
 LOADER2=FlashBoot
-<<<<<<< HEAD
 FlashData=bin/rk33/rk3308_ddr_589MHz_v1.21.bin
-FlashBoot=bin/rk33/rk3308_miniloader_v1.02.bin
-[OUTPUT]
-PATH=rk3308_loader_v1.21.102.bin
-=======
-FlashData=bin/rk33/rk3308_ddr_589MHz_v1.20.bin
 FlashBoot=bin/rk33/rk3308_miniloader_v1.03.bin
 [OUTPUT]
-PATH=rk3308_loader_v1.20.103.bin
->>>>>>> d3b354f... rk3308: miniloader: fix slc nand flash ecc error
+PATH=rk3308_loader_v1.21.103.bin