fixed merge conflicts. I dunno how to use git