git merging chaos