Git Merge Binary Files