re-merging