fixed merge conflicts

.gitignore

bob/pad/face/config/preprocessor/filename.py

bob/pad/face/database/__init__.py

bob/pad/face/database/maskattack.py

bob/pad/face/extractor/LTSS.py

bob/pad/face/extractor/LiFeatures.py

bob/pad/face/extractor/NormalizeLength.py

bob/pad/face/extractor/PPGSecure.py

bob/pad/face/extractor/__init__.py

bob/pad/face/preprocessor/Chrom.py

bob/pad/face/preprocessor/Li.py

bob/pad/face/preprocessor/PPGSecure.py

bob/pad/face/preprocessor/SSR.py

bob/pad/face/preprocessor/__init__.py

conda/meta.yaml

doc/extra-intersphinx.txt

requirements.txt