fixed git merge problem