Fix Merge Conflict Git