Merging content back in