Fixed merge conflicts

README.md

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

doc/jvetdoc.cls

doc/software-manual.tex

source/App/DecoderApp/DecApp.cpp

source/App/EncoderApp/EncApp.cpp

source/App/EncoderApp/EncAppCfg.cpp

source/App/EncoderApp/EncAppCfg.h

source/Lib/CommonLib/AdaptiveLoopFilter.cpp

source/Lib/CommonLib/HRD.h

source/Lib/CommonLib/LoopFilter.cpp

source/Lib/CommonLib/Picture.h

source/Lib/CommonLib/Slice.cpp

source/Lib/CommonLib/TypeDef.h

source/Lib/DecoderLib/DecLib.cpp

source/Lib/DecoderLib/DecLib.h

source/Lib/DecoderLib/VLCReader.cpp