fixed mergee conflicts

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -244,6 +244,8 @@ typedef struct UE_info {
   pdschTciStatesActDeact_t pdsch_TCI_States_ActDeact;
 } NR_UE_mac_ce_ctrl_t;
 
+typedef struct NR_sched_pucch {
+  int frame;
   int ul_slot;
   uint8_t dai_c;
   uint8_t timing_indicator;
@@ -251,7 +253,6 @@ typedef struct UE_info {
   struct NR_sched_pucch *next_sched_pucch;
 } NR_sched_pucch;
 
-
 /*! \brief scheduling control information set through an API */
 typedef struct {
   uint64_t dlsch_in_slot_bitmap;  // static bitmap signaling which slot in a tdd period contains dlsch