conflict in cpk nrs

.env.dist

.gitignore

.gitlab-ci.yml

bin/cpk

bin/new_cpk

bin/new_cpk.md

content/cpk/1000.en.md

content/cpk/1000.nl.md

content/cpk/1001.en.md

content/cpk/1001.nl.md

content/cpk/1002.en.md

content/cpk/1002.nl.md

content/cpk/1003.en.md

content/cpk/1003.nl.md

content/cpk/1004.en.md

content/cpk/1004.nl.md

content/cpk/1005.en.md

content/cpk/1005.nl.md

content/cpk/1006.en.md

content/cpk/1006.nl.md