Git Discard Merge Conflicts