Merge mml_edit