Added login partials
Fixed merge conflicts