Removing merge artifacts