Very basic conflict resolution