resolving the rest of the merge conflicts here