Removing failed merge artifacts