chore: resolve merge conflict

.cz.yaml

.dockerignore

.gitignore

.gitlab-ci.yml

.pre-commit-config.yaml

.pylintrc

.vscode/launch.json.license

.vscode/settings.json.license

CHANGELOG.md.license

Dockerfile

LICENSES/CC0-1.0.txt

LICENSES/MIT.txt

README.md

docker-compose.yml

package-lock.json.license

package.json.license

requirements.dev.txt

requirements.txt