pulled and merged with local branch login
working on modals
modals functional
resolved merge conflicts