re-enable merging