Login bug fix in progress
conflicts fixed
Fixed conflicts