fixing up stuff from failed merging