cleaning up some merge conflicts