no conflict from gitit
Merge branch 'master' of github.com:freiric/gitit-wikidata-local