resolved one stray merge conflict
removed simple calendar
weird _nav user role issue resolved