merge the conflict copy_files.sh