How to conflict resolution