Conflicts resolved.

.gitignore

.gitlab-ci.yml

Dockerfiles/base/Dockerfile

Dockerfiles/kpwr_n82_base/Dockerfile

Dockerfiles/kpwr_n82_large/Dockerfile

Dockerfiles/merged-base/Dockerfile

Dockerfiles/merged-large/Dockerfile

Dockerfiles/nkjp_base/Dockerfile

README.md

augment_dataset.py

config.cfg

core/poldeepner.py

data/kpwr_n82/valid.txt

evaluate_tsv.py

evaluator.py

poldeepner2/__init__.py

poldeepner2/data/document.py

poldeepner2/data/span.py

poldeepner2/data/token.py

poldeepner2/io/debug.py