resolving a bunch of merge conflicts