added login prw feature
fixed merge conflict