fix: merge description

Author: Florence Bockting

DESCRIPTION

@@ -11,8 +11,8 @@ Authors@R: c(person("Jonah", "Gabry", role = c("aut", "cre"), email = "jgabry@gm
              person("Frank", "Weber", role = "ctb"),
              person("Eduardo", "Coronado Sroka", role = "ctb"),
              person("Teemu", "Sailynoja", role = "ctb"),
-             person("Aki", "Vehtari", role = "ctb"), 
-             person("Behram", "Ulukır", role = "ctb"), 
+             person("Aki", "Vehtari", role = "ctb"),
+             person("Behram", "Ulukır", role = "ctb"),
              person("Visruth", "Srimath Kandali", role = "ctb"))
 Maintainer: Jonah Gabry <jgabry@gmail.com>
 Description: Plotting functions for posterior analysis, MCMC diagnostics,
@@ -44,11 +44,8 @@ Imports:
     tidyselect,
     utils
 Suggests:
-<<<<<<< dependence-aware-LOO-PIT
     brms (>= 2.23.0),
-=======
     cmdstanr,
->>>>>>> master
     ggdist,
     ggfortify,
     gridExtra (>= 2.2.1),