Clean up supermerge.