# Conflicts:
#   source/Lib/CommonLib/TypeDef.h

JVET-O0432: update LMCS encoder parameters in nonCTC cfg files

See merge request jvet/VVCSoftware_VTM!760

JVET-O0681: disable BCW for CIIP, method 2 inherit BCW index

See merge request jvet/VVCSoftware_VTM!743

JVET-O0220 method-1: Parse merge_subblock_flag conditioned on MaxNumSubblockMergeCand

See merge request jvet/VVCSoftware_VTM!754

JVET-O0409: exclude coded_subblock_flag from counting context-coded bins in transform skip

See merge request !723

# Conflicts:
#   source/Lib/CommonLib/TypeDef.h

JVET-O0364 Part 2: clean up padding process in intra prediction

See merge request jvet/VVCSoftware_VTM!740

JVET-O0379: Speedup mode decision process for triangle prediction mode.

See merge request jvet/VVCSoftware_VTM!749

JVET-O0061 Halfpel MV threshold deblocking

See merge request jvet/VVCSoftware_VTM!753

# Conflicts:
#   source/Lib/CommonLib/TypeDef.h

JVET-O0159 10bitTcTable Deblocking

See merge request jvet/VVCSoftware_VTM!752

fix for debugging functionality (decoder at the encoder)

See merge request !756