resolving conflicts
fixed logon conflict