Resolving conflict with doc