cleaning uo bad merge