working on --merge-no-sort
fix merge regression