think I fixed all of the merge conflicts