Git Abort Merge Conflict