Implement conflict resolution (huge feature !)