Fix a few more merge conflicts
Merge pull request #2589 from vlakoff/feature/user-guide-cleanup

Fix a few more merge conflicts