don't expose internal conflict resolver
Reorganize defaults