Failed! Deleted File git-merge-ours