wow fixing up a bad situation
removed some conflict code remnants