Check login action added
Merge conflicts resolved