git merging code fixes for mac