fixed a couple of merge conflicts