Refactor syntax 6 7 dp 8 merge