A brief post on how to resolve git merge conflicts with binary files like images.