diff --git a/iso/ks.cfg b/iso/ks.cfg
index 108171569..46a18b055 100644
--- a/iso/ks.cfg
+++ b/iso/ks.cfg
@@ -165,18 +165,11 @@ fi
 # Copying Repo to the nailgun /var/www directory
 repodir="/var/www/nailgun"
 mkdir -p ${repodir}/centos/6.3/nailgun/x86_64
-<<<<<<< HEAD
-cp -r ${CD}/images ${repodir}/centos/6.3/nailgun/x86_64
-cp -r ${CD}/isolinux ${repodir}/centos/6.3/nailgun/x86_64
-cp -r ${CD}/repodata ${repodir}/centos/6.3/nailgun/x86_64
-cp -r ${CD}/Packages ${repodir}/centos/6.3/nailgun/x86_64
-cp ${CD}/more_rpm/MySQL-shared-5.5.28-1.el6.x86_64.rpm ${CD}/more_rpm/MySQL-client-5.5.28-1.el6.x86_64.rpm ${CD}/more_rpm/MySQL-server-5.5.28_wsrep_23.7-1.rhel5.x86_64.rpm ${CD}/more_rpm/galera-23.2.2-1.rhel5.x86_64.rpm ${repodir}
-=======
 cp -r ${SOURCE}/images ${repodir}/centos/6.3/nailgun/x86_64
 cp -r ${SOURCE}/isolinux ${repodir}/centos/6.3/nailgun/x86_64
 cp -r ${SOURCE}/repodata ${repodir}/centos/6.3/nailgun/x86_64
 cp -r ${SOURCE}/Packages ${repodir}/centos/6.3/nailgun/x86_64
->>>>>>> Removed usbks.cfg in order to get rid kickstart code duplication
+cp ${SOURCE}/more_rpm/MySQL-shared-5.5.28-1.el6.x86_64.rpm ${SOURCE}/more_rpm/MySQL-client-5.5.28-1.el6.x86_64.rpm ${SOURCE}/more_rpm/MySQL-server-5.5.28_wsrep_23.7-1.rhel5.x86_64.rpm ${SOURCE}/more_rpm/galera-23.2.2-1.rhel5.x86_64.rpm ${repodir}
 
 # Copying eggs/gems to the nailgun directory
 cp -r ${SOURCE}/eggs ${repodir}
diff --git a/mirror/module.mk b/mirror/module.mk
index 76a49907e..5de0d4397 100644
--- a/mirror/module.mk
+++ b/mirror/module.mk
@@ -238,11 +238,13 @@ else
 SRC_URLS:=$(shell grep -v ^\\s*\# requirements-src.txt | sed "s=.*/\(.*\)=$(MIRROR_URL)/src/\1=")
 endif
 
-$/src.done:
-	@mkdir -p $/src
-	wget --no-use-server-timestamps -c -P $/src $(SRC_URLS)
+$/src.done: | $(addprefix $/src/, $(notdir $(SRC_URLS)))
 	$(ACTION.TOUCH)
 
+$(addprefix $/src/, $(notdir $(SRC_URLS))):
+	@mkdir -p $/src
+	wget --no-use-server-timestamps -c -P $/src $(shell echo $(SRC_URLS) | grep $(notdir $@))
+
 $/gems-bundle.done: $/gems-bundle-gemfile.done
 	( cd $/gems-bundle && bundle install --path ./ && bundle package )
 	( cd $/gems-bundle/vendor/cache/ && gem fetch -v 1.2.1 bundler )