fix flush and interleaving by edit units