fixed merge conflict and broken login