Conflict resolution strategy
Merge pull request #57 from FabioBatSilva/conflict-resolver

Conflict resolution strategy