Fixing artifacts from merge