provoking conflict
Merge branch 'master' of github.com:phereman/ikiwiki-hackbase.be
committing without resolving conflict