Made an error message more helpful in Content
Merge remote-tracking branch 'origin/master'