I'm stuck on this one: ?I type git merge origin/master but it just says can't merge for whatever reason.
You are on your local master branch. In your commit history, the commit message of the HEAD commit is:
Add first question to Physics quiz
From the terminal, merge with origin/master, where Sally's most recent commits are.
Notice the output:
biology.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)