pre pull
fixed merge
working floating login status
fixed merge