removed crap from merge