Pull guideline edits and markup changes