fixed git merge problems