How do I fix a merge conflict in Git? – O’Reilly