fixed a bunch of merge conflicts manually. not sure why I wasn't prompted to fix them. had to search for >>>