removing merge shit