cleaned up some merge errors