Someone added a merge conflict into the source. It has been removed.
Changed the guide title to be more descriptive.