diff --git a/R/mvgam.R b/R/mvgam.R
index 92e39a7c..9c0c7040 100644
--- a/R/mvgam.R
+++ b/R/mvgam.R
@@ -968,14 +968,11 @@ mvgam = function(formula,
                     base_model)] <- c('  ## parametric effect priors (regularised for identifiability)')
   }
 
-<<<<<<< HEAD
   # For any random effect smooths, use non-centred parameterisation to avoid degeneracies
-=======
   # For any random effect smooths,
   # use the non-centred parameterisation to avoid degeneracies
   # For monotonic smooths, need to determine which direction to place
   # coefficient constraints
->>>>>>> 5d33eab45987d8a751ddce5f798cfc5e3bedd526
   smooth_labs <- do.call(rbind, lapply(seq_along(ss_gam$smooth), function(x){
     data.frame(label = ss_gam$smooth[[x]]$label, class = class(ss_gam$smooth[[x]])[1])
   }))
diff --git a/src/mvgam.dll b/src/mvgam.dll
index 9d2fad61..fa4f2bc4 100644
Binary files a/src/mvgam.dll and b/src/mvgam.dll differ
diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf
index bc9c3bbe..c63ab130 100644
Binary files a/tests/testthat/Rplots.pdf and b/tests/testthat/Rplots.pdf differ