Fixed weird git merge information