diff --git a/grobid-core/src/test/java/org/grobid/core/utilities/LayoutTokensUtilTest.java b/grobid-core/src/test/java/org/grobid/core/utilities/LayoutTokensUtilTest.java
index 6f693756d7..c206922523 100644
--- a/grobid-core/src/test/java/org/grobid/core/utilities/LayoutTokensUtilTest.java
+++ b/grobid-core/src/test/java/org/grobid/core/utilities/LayoutTokensUtilTest.java
@@ -1,23 +1,17 @@
 package org.grobid.core.utilities;
 
-<<<<<<< HEAD
-=======
 import com.google.common.collect.Iterables;
->>>>>>> master
 import org.grobid.core.analyzers.GrobidAnalyzer;
 import org.grobid.core.layout.LayoutToken;
 import org.junit.Test;
 
 import java.util.List;
-<<<<<<< HEAD
 import java.util.stream.IntStream;
 
 import static org.hamcrest.Matchers.is;
-=======
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.hasSize;
->>>>>>> master
 import static org.junit.Assert.assertThat;
 
 public class LayoutTokensUtilTest {
diff --git a/grobid-home/config/grobid.properties b/grobid-home/config/grobid.properties
index 34593a7c2d..bad868d3b6 100755
--- a/grobid-home/config/grobid.properties
+++ b/grobid-home/config/grobid.properties
@@ -15,8 +15,8 @@ grobid.3rdparty.pdf2xml.timeout.sec=60
 
 #-------------------- consolidation --------------------
 # Define the bibliographical data consolidation service to be used, either "crossref" for CrossRef REST API or "glutton" for /~https://github.com/kermitt2/biblio-glutton
-#grobid.consolidation.service=crossref
-grobid.consolidation.service=glutton
+grobid.consolidation.service=crossref
+#grobid.consolidation.service=glutton
 #org.grobid.glutton.host=cloud.science-miner.com/glutton
 #org.grobid.glutton.port=0
 org.grobid.glutton.host=localhost