I think you meant "login" ;) Otherwise everything looks good now, but if you do a amend now you can also get rid of the merge commit if you want, but not required :)