fixed strange git merge changes