started login method in vendors controller
fixed merge conflicts