Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks

doc/FEATURE_SET.md

@@ -309,7 +309,6 @@ The following features are valid for the gNB and the 5G-NR UE.
 - ACK / NACK handling and HARQ procedures for downlink
 - **As of May 2020** only DL was validated with COTS phone ; UL in progress, validated with OAI UE in noS1 mode
 
-
 # OpenAirInterface 5G-NR UE Feature Set #
 
 **as of May 2020** only supporting "noS1" mode (DL):
@@ -353,11 +352,8 @@ The following features are valid for the gNB and the 5G-NR UE.
 - Initial sync and MIB detection
 - MAC -> PHY configuration of PHY via UE FAPI P5 interface
 - Basic MAC to control PHY via UE FAPI P7 interface
-<<<<<<< HEAD
 - Random access procedure
-=======
-- Random ccess procedure
->>>>>>> origin/develop
+
 
 **RLC**