resolve confilct

.gitignore

.gitlab-ci.yml

CMakeLists.txt

COPYING

Makefile

README.md

cfg/444/yuv444.cfg

cfg/encoder_intra_vtm.cfg

cfg/encoder_lowdelay_P_vtm.cfg

cfg/encoder_lowdelay_vtm.cfg

cfg/encoder_randomaccess_vtm.cfg

cfg/field/VTM_encoder_lowdelay_field_GOP16.cfg

cfg/field/VTM_encoder_lowdelay_field_GOP8.cfg

cfg/field/VTM_encoder_randomaccess_field_GOP16.cfg

cfg/field/VTM_encoder_randomaccess_field_GOP32.cfg

cfg/layers.cfg

cfg/lossless/lossless.cfg

...nfigExamples/encoder_randomaccess_vtm_RasterScanSlice.cfg

...figExamples/encoder_randomaccess_vtm_RectangularSlice.cfg

...es/encoder_randomaccess_vtm_RectangularSliceFixedSize.cfg