Fixed the merge issue after login
Adding changelog.md