Use "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.
Better Git conflict resolution between binaries with --theirs and --ours
kevinold.com