diff --git a/create_arm_img_urpmi.sh b/create_arm_img_urpmi.sh
old mode 100755
new mode 100644
diff --git a/platforms/bananaPro/specialFunctions.sh b/platforms/bananaPro/specialFunctions.sh~
similarity index 100%
rename from platforms/bananaPro/specialFunctions.sh
rename to platforms/bananaPro/specialFunctions.sh~
diff --git a/platforms/rpi1/specialFunctions.sh b/platforms/rpi1/specialFunctions.sh~
similarity index 100%
rename from platforms/rpi1/specialFunctions.sh
rename to platforms/rpi1/specialFunctions.sh~
diff --git a/platforms/rpi2/specialFunctions.sh b/platforms/rpi2/specialFunctions.sh~
similarity index 100%
rename from platforms/rpi2/specialFunctions.sh
rename to platforms/rpi2/specialFunctions.sh~
diff --git a/platforms/rpi3+/specialFunctions.sh b/platforms/rpi3+/specialFunctions.sh~
similarity index 100%
rename from platforms/rpi3+/specialFunctions.sh
rename to platforms/rpi3+/specialFunctions.sh~
diff --git a/platforms/rpi3/specialFunctions.sh b/platforms/rpi3/specialFunctions.sh~
similarity index 100%
rename from platforms/rpi3/specialFunctions.sh
rename to platforms/rpi3/specialFunctions.sh~
diff --git a/platforms/xu4/specialFunctions.sh b/platforms/xu4/specialFunctions.sh~
similarity index 83%
rename from platforms/xu4/specialFunctions.sh
rename to platforms/xu4/specialFunctions.sh~
index 953be47..6b205bf 100755
--- a/platforms/xu4/specialFunctions.sh
+++ b/platforms/xu4/specialFunctions.sh~
@@ -63,11 +63,19 @@ function bunrningBootloader()
 
 function copyingCustomSystem()
 {
+<<<<<<< HEAD
 #     ODROID_BOOT="${BUILD_PATH}/mnt/odroid_boot"
 #     if ! [ -d "${ODROID_BOOT}" ]; then
 #         rm -rf "${ODROID_BOOT}"
 #         mkdir -p "${ODROID_BOOT}"
 #     fi
+=======
+    ODROID_BOOT="${BUILD_PATH}/mnt/odroid_boot"
+    if ! [ -d "${ODROID_BOOT}" ]; then
+        rm -rf "${ODROID_BOOT}"
+        mkdir -p "${ODROID_BOOT}"
+    fi
+>>>>>>> d7c2376925bec483811b4bdada1c415b5a333b91
     case ${TARGET_VERSION} in
         "xu4")
             info "copying u-boot for ${TARGET} ${TARGET_VERSION}"
@@ -78,9 +86,15 @@ function copyingCustomSystem()
 
     info "Copying extlinux.conf on ${ODROID_BOOT}"
     cp --preserve=mode -R "${BUILD_PATH}/boot/extlinux" "${ODROID_BOOT}/"
+<<<<<<< HEAD
 #     info "copying Mageia image to root partition"
 #     /bin/rsync -rlptogDH --exclude "${ODROID_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
 #     /bin/rsync -rlptogDH "${ODROID_BOOT}/" "${BOOT}/"
+=======
+    info "copying Mageia image to root partition"
+    /bin/rsync -rlptogDH --exclude "${ODROID_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDH "${ODROID_BOOT}/" "${BOOT}/"
+>>>>>>> d7c2376925bec483811b4bdada1c415b5a333b91
     return 0
 }
 
diff --git a/tools/resize_root.sh b/tools/resize_root.sh~
similarity index 100%
rename from tools/resize_root.sh
rename to tools/resize_root.sh~