02-collab.md and 03-conflict.md: rolling back changes to original version
grabbed glossary