diff --git a/cli_01b.r b/cli_01b.r
index 850936d96cd7ead3d1527f870af88f2ad307b611..ad8c31fa8ab98addc44c297503145b2fa98fb112 100644
--- a/cli_01b.r
+++ b/cli_01b.r
@@ -105,6 +105,4 @@ ncores         <- cli$options$ncores
 # ------------------------------------------------------------------------------
 
 source("01b_MesobromionCluster.R")
-<<<<<<< HEAD
 Mesobromion(species.path, traits.path, output, myfunction, combinations, start.round, relax.round,
->>>>>>> 8a43e44028ed18129c0ddc708e41bbedf1cd9177
diff --git a/submit_01b.sh b/submit_01b.sh
index 6184a13d6192df2a6a91dc07510e292fd2e04c73..e2544bc547d8628a297974cce339eed196a783e9 100644
--- a/submit_01b.sh
+++ b/submit_01b.sh
@@ -23,7 +23,7 @@ Rscript \
     --max.inter.t 20 \
     --chunk.i NA \
     --chunkn NA \
-    --nperm 999 \
+    --nperm 199 \
     --ncores ${NSLOTS:-1} \
     --start.round 4 \
     --relax.round 7 \