Fix conflicts.
TNL-797: Add Notes page.