Wording and grammar updates to guides
resolve conflict