better exporting support with conflict solving strategies for import