fixes for step 2 (from task doc)
Merge remote-tracking branch 'refs/remotes/origin/master'