fixed a git merge bug