Added a different 'upserting' merge strategy