resolved conflicts, login returns oui info