Basic conflict resolution based on strength alone should work and emit
the correct message.
Merge me up
Merge branch 'master' of https://github.com/keithkade/Fantegio