rersolved merge conflicts

.gitignore

.gitlab-ci.yml

CDB/LOFAR_ConfigDb.json

CDB/integration_ConfigDb.json

CDB/jasper_ConfigDb.json

CDB/stations/DTS_ConfigDb.json

CDB/stations/LTS_ConfigDb.json

CDB/stations/simulators_ConfigDb.json

CDB/test_ConfigDb.json

CDB/thijs_ConfigDb.json

CDB/thomas_ConfigDb.json

CDB/thomas_arm64_ConfigDb.json

CDB/windows_ConfigDb.json

bin/dump_ConfigDb.sh

bin/itango_console.sh

bin/itango_shell.sh

bin/start-DS.sh

bin/start-ds.sh

bootstrap/etc/lofar20rc.sh

devices/.stestr.conf