moving the example to its own module
No longer allowing conflict resolution to be set to a default

Also added multiple possible conflict resolution functions, admonition in the
readme with links to resources.