Failed! Deleted File git-merge-one-file