re-enabling the merging