login logout fixed
Fix conflict