Removed artifacts from merge