Almost complete on the re-merging