Added conflict resolution