fixed merge conflicts i think
more merge conflict fixes