fixed a bunch of merge conflicts