Fixing merge conflict in Quickstart section.