Removing merge conflict remnants in the guides.