removed artifacts from merge