finish login ctrl and add login form
fix merge conflict