clean up merge remnants