resolving conflict once more