Oops. Merge conflict in doc/source/conf.py was left unresolved.
bump year in doc