commit from laptop
resolved the merge conflict.
fixed microsoft account login issue.