merge conflicts with master, code sections, updated collaborative sections, typesetting, etc