Fix merge conflicts

Will probably work. Maybe.