fixed previous git merge