removing merge conflicts/cleaning things up