refactoring: #18 customize the conflict resolution modal