removed some merge conflicts. whoops