ACTUALLY merge things *PROPERLY*