Giant git merging failure resolved