login-window fix
conflict