doge
mergeconfligt
nanoc collection note
fix sitemap helper
cleanup