fixed git merge shit