resolve merge conflict

NEWS.md

@@ -1,7 +1,11 @@
 # CHANGES IN GGIR VERSION 3.2-0
 
-- Visual report: Bug fixed in handling recordings that start at midnight #1257
+- New visual report: Bug fixed in handling recordings that start at midnight #1257
 
+- Part 6 and new visual report: Fix bug related to determining the combination of thresholds to use for the 
+  visual report and for part 6 analyses when there are several options and 
+  part6_threshold_combi is NULL. #1260
+
 # CHANGES IN GGIR VERSION 3.1-11
 
 - Part 2:

R/check_params.R

@@ -364,9 +364,9 @@ check_params = function(params_sleep = c(), params_metrics = c(),
     if ((length(params_phyact[["threshold.lig"]]) == 1 &&
         length(params_phyact[["threshold.mod"]]) == 1 &&
         length(params_phyact[["threshold.vig"]]) == 1) | is.null(params_phyact[["part6_threshold_combi"]])) {
-      params_phyact[["part6_threshold_combi"]] = paste(params_phyact[["threshold.lig"]],
-                                                       params_phyact[["threshold.mod"]],
-                                                       params_phyact[["threshold.vig"]], sep = "_")
+      params_phyact[["part6_threshold_combi"]] = paste(params_phyact[["threshold.lig"]][1],
+                                                       params_phyact[["threshold.mod"]][1],
+                                                       params_phyact[["threshold.vig"]][1], sep = "_")
     }
   }
   # params output