Corrects strange artifacts from merge