fixed merge remnants.