Added conflict resolution method