fixed terrible git merge