Fix embedded_in_root_associations to merge correctly