WIP: Add new conflict resolution examples