fixed merge conflict
more merge stuff