fix legacy conflict text

notes/CodeFlag_notes.csv

@@ -140,7 +140,6 @@ noteID,note
 143,"In the nested ordering scheme, the 12 rhomboids are scanned in order defined in Gorsky et al. 2015. The flag bits then refer to how the points are scanned within a rhomboid."
 144,"This is the Julian day of the year that surface melt begins."
 145,"This is the Julian day of the year that surface freeze begins."
-<<<<<<< HEAD
 146,"For code number 102 the drought index encoded in the message is specified by the table entries from discipline 0 and parameter category 22 with the corresponding parameter number. The statistical processing period of the drought index is defined by the keys ""length of time range"" and ""indicator of unit of time for the increment"""
 147,"Descriptions of the drought indices in discipline 0, meteorology, category 22 are available in the Handbook of Drought Indicators and Indices (WMO-No. 1173) [https://library.wmo.int/idurl/4/55169]. The indices are specified by setting discipline and parameter category/number to the specific index to be encoded. Drought indicators are calculated over different time ranges, prescribed by the 'Length of time range' and 'Indicator of unit for time range' parameters in the templates 4.107, 4.108, 4.109 and 4.112. All standardized drought indices are calculated according to the Standardized Precipitation Index User Guide (WMO-No. 1090)[https://library.wmo.int/idurl/4/39629]."
 148,"This entry is intended to be used with templates 4.112 and 4.123. Instead of having the probability of the exceedance of the anomaly (code number 0) of the limits specified in the message, it specifies probabilities which were calculated for the forecast and for the reference dataset with the given specification listed in the meta-data. The anomaly is calculated between the two derived probabilities."