diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index b552b76d09c7747248d1037396a92cd65f718f33..22e78a560a840c87a191ce28b6667f2dac5d26ca 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -487,6 +487,7 @@ DecLib::DecLib()
 #endif
 #if JVET_Q0117_PARAMETER_SETS_CLEANUP
   , m_dci(NULL)
+#endif
 #if JVET_P0978_RPL_RESTRICTIONS
   , m_decodingOrderCounter(0)
 #endif
@@ -2039,6 +2040,17 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
     m_pcPic->setPictureType(nalu.m_nalUnitType);
   }
 
+<<<<<<< HEAD
+=======
+#if JVET_P0978_RPL_RESTRICTIONS
+  if (m_bFirstSliceInPicture)
+  {
+    m_pcPic->setDecodingOrderNumber(m_decodingOrderCounter);
+    m_decodingOrderCounter++;
+    m_pcPic->setPictureType(nalu.m_nalUnitType);
+  }
+
+>>>>>>> JVET-P0978 Adding RPL related bitstream constraints
   pcSlice->checkCRA(pcSlice->getRPL0(), pcSlice->getRPL1(), m_pocCRA, m_cListPic);
 #else
   pcSlice->checkCRA(pcSlice->getRPL0(), pcSlice->getRPL1(), m_pocCRA, m_associatedIRAPType, m_cListPic);