removing merge artifacts