diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index fba936e50f..036de2928d 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -172,15 +172,8 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
 
       [ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000
 
-<<<<<<< HEAD
       [ ${retry_nr} -gt 0 ]
     done
-=======
-  if [ -n "$disk" ]; then
-    mount_part "$disk" "/storage" "rw,noatime"
-    update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
-    update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
->>>>>>> 32562d4fa964979f0879f096451a8bbc20b9f7d9
 
     if [ ! -e /sysroot/sbin/init ]; then
       error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT"
@@ -217,8 +210,6 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
       update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
       update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
 
-      umount /storage
-
       if test "$REBOOT" -eq "1"; then
         echo "System reboots now..." && \
         /bin/busybox reboot
@@ -235,6 +226,10 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
 
     # move /flash and /storage to /sysroot
     /bin/busybox mount --move /flash /sysroot/flash
+
+    if [ -n "$disk" ]; then
+      /bin/busybox mount --move /storage /sysroot/storage
+    fi
   }
 
   if [ -z "$NETBOOT" ]; then
@@ -243,17 +238,7 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
     mount_nbd
   fi
 
-<<<<<<< HEAD
-=======
-# move /flash and /storage to /sysroot
-  /bin/busybox mount --move /flash /sysroot/flash
-
-  if [ -n "$disk" ]; then
-    /bin/busybox mount --move /storage /sysroot/storage
-  fi
-
->>>>>>> 32562d4fa964979f0879f096451a8bbc20b9f7d9
-# unmount all other filesystems
+  # unmount all other filesystems
   /bin/busybox umount /dev
   /bin/busybox umount /proc
   /bin/busybox umount /sys