Commiting login page changes
resolving merge conflicts