Clean up a git conflict