Resolve conflicts

.gitlab-ci.yml

CI/DockerfileFull

CI/DockerfileLight

CI/gitlab_api_examples.md

CMakeLists.txt

FSL/CMakeLists.txt

FSL/src/fsl_mainwindow.cpp

FullSimLight/CMakeLists.txt

FullSimLight/Plugins/CMakeLists.txt

...orPlugins/FSLExamplePrimaryGeneratorPlugin/CMakeLists.txt

...ticFieldPlugins/UniformMagneticFieldPlugin/CMakeLists.txt

.../PhysicsListPlugins/FSLTestPhysListPlugins/CMakeLists.txt

...Examples/SensitiveDetectorPlugins/SDPlugin/CMakeLists.txt

...imLight/Plugins/Examples/UserActionPlugins/CMakeLists.txt

...es/UserActionPlugins/DummyUserActionPlugin/CMakeLists.txt

...mmyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt

FullSimLight/Plugins/HitsPlugin/CMakeLists.txt

FullSimLight/Plugins/TracksPlugin/CMakeLists.txt

FullSimLight/fullSimLight.cc

FullSimLight/geantino_HGTD.g4