conflict resolution
example configuration