Code to merge it all back in...