Added conflict resolution functions