removing crap from merging