bug with conflicts in copyFile fixed