Merge it all back in