removed crap
removed conflicts