merge
login Modal added