fixed git merge crash