Added conflict resolution mechanism