fixed merge conflicts

.gitlab-ci.yml

PhageTerm.py

PhageTerm_env.yml

PhageTerm_env_3.yml

README.txt

__init__.py

_modules/GPU_allMapper.py

_modules/GPU_baseMapper.py

_modules/GPU_chunkMapper.py

_modules/GPU_mappingResults.py

_modules/IData_handling.py

_modules/OCL_kernels.py

_modules/OCL_kernels_32.py

_modules/common_OCL_Kernels.py.old

_modules/common_readsCoverage_processing.py

_modules/functions_PhageTerm.py

_modules/functions_PhageTerm_gpu.py

_modules/generate_report.py

_modules/main_utils.py

_modules/readsCoverage_res.py