remove files
modify git_merge