Git Cannot Merge Binary Files