resolving some of the merge conflicts