login view and Controller
resolving merge