docs are in place
resolving conflict