Login modal
Resolved merge conflict