(HEVC) Fix merge issues