fixed weird git merge stuff