Merging back in