Git Merge Conflict Take Remote Version