diff --git a/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
index 88b37809c..2319e1668 100644
--- a/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
+++ b/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
@@ -230,13 +230,8 @@ public class CsvExporterTests extends RefineTest {
             Assert.fail();
         }
 
-<<<<<<< HEAD
         String expectedOutput = ParsingUtilities.instantToLocalDateTimeString(calendar.toInstant()) + "," +
             ParsingUtilities.instantToLocalDateTimeString(date.toInstant()) + "\n";
-=======
-        String expectedOutput = ParsingUtilities.localDateToString(localDate) + "," +
-            ParsingUtilities.dateToString(date) + "\n";
->>>>>>> parent of c4b0ff6be... data package metadata  (#1398)
 
         Assert.assertEquals(writer.toString(), expectedOutput);
     }
diff --git a/main/webapp/modules/core/scripts/index/open-project-ui.js b/main/webapp/modules/core/scripts/index/open-project-ui.js
index e4083a95e..c3340f950 100644
--- a/main/webapp/modules/core/scripts/index/open-project-ui.js
+++ b/main/webapp/modules/core/scripts/index/open-project-ui.js
@@ -261,7 +261,6 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
       .attr("href", "project?project=" + project.id)
       .appendTo($(tr.insertCell(tr.cells.length)));
       
-    
     var tagsCell = $(tr.insertCell(tr.cells.length));
     var tags = project.tags;
     tags.map(function(tag){