resolving conflict
resolve conflicting
resolving