preventing and resolving conflict