Allow resolving merge conflicts in binary files

We don't allow resolving merge conflicts in binary files, because typically it's not easy to merge them. However, we could always just ask the user to pick a version they want to keep, and then use that version.