diff --git a/test/e2e/data/tiles/wgs84/0/r0_c1.mapml b/test/e2e/data/tiles/wgs84/0/r0_c1.mapml
index 72aa32502..055d31f57 100644
--- a/test/e2e/data/tiles/wgs84/0/r0_c1.mapml
+++ b/test/e2e/data/tiles/wgs84/0/r0_c1.mapml
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/1/r0_c0.mapml b/test/e2e/data/tiles/wgs84/1/r0_c0.mapml
index 3e3831efd..2169228ef 100644
--- a/test/e2e/data/tiles/wgs84/1/r0_c0.mapml
+++ b/test/e2e/data/tiles/wgs84/1/r0_c0.mapml
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/1/r0_c1.mapml b/test/e2e/data/tiles/wgs84/1/r0_c1.mapml
index f239f337c..57d138166 100644
--- a/test/e2e/data/tiles/wgs84/1/r0_c1.mapml
+++ b/test/e2e/data/tiles/wgs84/1/r0_c1.mapml
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/1/r0_c2.mapml b/test/e2e/data/tiles/wgs84/1/r0_c2.mapml
index 5f15f787b..6868d3ef9 100644
--- a/test/e2e/data/tiles/wgs84/1/r0_c2.mapml
+++ b/test/e2e/data/tiles/wgs84/1/r0_c2.mapml
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/1/r0_c3.mapml b/test/e2e/data/tiles/wgs84/1/r0_c3.mapml
index 453fac23f..875c45045 100644
--- a/test/e2e/data/tiles/wgs84/1/r0_c3.mapml
+++ b/test/e2e/data/tiles/wgs84/1/r0_c3.mapml
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/1/r1_c0.mapml b/test/e2e/data/tiles/wgs84/1/r1_c0.mapml
index b4ff48562..d1bff162f 100644
--- a/test/e2e/data/tiles/wgs84/1/r1_c0.mapml
+++ b/test/e2e/data/tiles/wgs84/1/r1_c0.mapml
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/1/r1_c1.mapml b/test/e2e/data/tiles/wgs84/1/r1_c1.mapml
index da34417bb..497c116a8 100644
--- a/test/e2e/data/tiles/wgs84/1/r1_c1.mapml
+++ b/test/e2e/data/tiles/wgs84/1/r1_c1.mapml
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/1/r1_c2.mapml b/test/e2e/data/tiles/wgs84/1/r1_c2.mapml
index cd9bbbe2f..df9da0f50 100644
--- a/test/e2e/data/tiles/wgs84/1/r1_c2.mapml
+++ b/test/e2e/data/tiles/wgs84/1/r1_c2.mapml
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/1/r1_c3.mapml b/test/e2e/data/tiles/wgs84/1/r1_c3.mapml
index 5511d612f..9b131daed 100644
--- a/test/e2e/data/tiles/wgs84/1/r1_c3.mapml
+++ b/test/e2e/data/tiles/wgs84/1/r1_c3.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c0.mapml b/test/e2e/data/tiles/wgs84/2/r0_c0.mapml
index d7e9801b8..77d708d97 100644
--- a/test/e2e/data/tiles/wgs84/2/r0_c0.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r0_c0.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c1.mapml b/test/e2e/data/tiles/wgs84/2/r0_c1.mapml
index c3d73dc73..77d708d97 100644
--- a/test/e2e/data/tiles/wgs84/2/r0_c1.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r0_c1.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c2.mapml b/test/e2e/data/tiles/wgs84/2/r0_c2.mapml
index 426a5513d..03bd034f7 100644
--- a/test/e2e/data/tiles/wgs84/2/r0_c2.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r0_c2.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c3.mapml b/test/e2e/data/tiles/wgs84/2/r0_c3.mapml
index 8910da0ea..03bd034f7 100644
--- a/test/e2e/data/tiles/wgs84/2/r0_c3.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r0_c3.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c4.mapml b/test/e2e/data/tiles/wgs84/2/r0_c4.mapml
index f304df6e6..7da601a4f 100644
--- a/test/e2e/data/tiles/wgs84/2/r0_c4.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r0_c4.mapml
@@ -4,34 +4,9 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c5.mapml b/test/e2e/data/tiles/wgs84/2/r0_c5.mapml
index 84d1f7919..540a9df54 100644
--- a/test/e2e/data/tiles/wgs84/2/r0_c5.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r0_c5.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c6.mapml b/test/e2e/data/tiles/wgs84/2/r0_c6.mapml
index fd19f79ec..ccaba2340 100644
--- a/test/e2e/data/tiles/wgs84/2/r0_c6.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r0_c6.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c7.mapml b/test/e2e/data/tiles/wgs84/2/r0_c7.mapml
index c626f1ba9..ccaba2340 100644
--- a/test/e2e/data/tiles/wgs84/2/r0_c7.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r0_c7.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c0.mapml b/test/e2e/data/tiles/wgs84/2/r1_c0.mapml
index e849c9d26..151254ce2 100644
--- a/test/e2e/data/tiles/wgs84/2/r1_c0.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r1_c0.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c1.mapml b/test/e2e/data/tiles/wgs84/2/r1_c1.mapml
index 4435b1b49..c9b44f1fd 100644
--- a/test/e2e/data/tiles/wgs84/2/r1_c1.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r1_c1.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c2.mapml b/test/e2e/data/tiles/wgs84/2/r1_c2.mapml
index e2475d36d..7dce994dd 100644
--- a/test/e2e/data/tiles/wgs84/2/r1_c2.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r1_c2.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c3.mapml b/test/e2e/data/tiles/wgs84/2/r1_c3.mapml
index 4a8337602..e064ce463 100644
--- a/test/e2e/data/tiles/wgs84/2/r1_c3.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r1_c3.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c4.mapml b/test/e2e/data/tiles/wgs84/2/r1_c4.mapml
index 85ed934d1..c8e380c84 100644
--- a/test/e2e/data/tiles/wgs84/2/r1_c4.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r1_c4.mapml
@@ -4,32 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
+
+
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c5.mapml b/test/e2e/data/tiles/wgs84/2/r1_c5.mapml
index eeb24b50c..55047540e 100644
--- a/test/e2e/data/tiles/wgs84/2/r1_c5.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r1_c5.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c6.mapml b/test/e2e/data/tiles/wgs84/2/r1_c6.mapml
index ebdb3a32b..a7c6128e5 100644
--- a/test/e2e/data/tiles/wgs84/2/r1_c6.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r1_c6.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c7.mapml b/test/e2e/data/tiles/wgs84/2/r1_c7.mapml
index 7fd6c6cbe..daf0bd2d4 100644
--- a/test/e2e/data/tiles/wgs84/2/r1_c7.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r1_c7.mapml
@@ -4,31 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c0.mapml b/test/e2e/data/tiles/wgs84/2/r2_c0.mapml
index 87b2de0c3..13d23f962 100644
--- a/test/e2e/data/tiles/wgs84/2/r2_c0.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r2_c0.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c1.mapml b/test/e2e/data/tiles/wgs84/2/r2_c1.mapml
index 8f80d788e..1e8c8e68e 100644
--- a/test/e2e/data/tiles/wgs84/2/r2_c1.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r2_c1.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c2.mapml b/test/e2e/data/tiles/wgs84/2/r2_c2.mapml
index a891cf845..03690948a 100644
--- a/test/e2e/data/tiles/wgs84/2/r2_c2.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r2_c2.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c3.mapml b/test/e2e/data/tiles/wgs84/2/r2_c3.mapml
index 3083ac1da..ddb9cae91 100644
--- a/test/e2e/data/tiles/wgs84/2/r2_c3.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r2_c3.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c4.mapml b/test/e2e/data/tiles/wgs84/2/r2_c4.mapml
index 33092ca0b..9acb1185d 100644
--- a/test/e2e/data/tiles/wgs84/2/r2_c4.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r2_c4.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c5.mapml b/test/e2e/data/tiles/wgs84/2/r2_c5.mapml
index fb0892d83..9c79ad1cd 100644
--- a/test/e2e/data/tiles/wgs84/2/r2_c5.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r2_c5.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c6.mapml b/test/e2e/data/tiles/wgs84/2/r2_c6.mapml
index 4ddb38054..2198c7413 100644
--- a/test/e2e/data/tiles/wgs84/2/r2_c6.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r2_c6.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c7.mapml b/test/e2e/data/tiles/wgs84/2/r2_c7.mapml
index 04fde5133..38a81ce18 100644
--- a/test/e2e/data/tiles/wgs84/2/r2_c7.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r2_c7.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c0.mapml b/test/e2e/data/tiles/wgs84/2/r3_c0.mapml
index 7d219b891..4be428758 100644
--- a/test/e2e/data/tiles/wgs84/2/r3_c0.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r3_c0.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c1.mapml b/test/e2e/data/tiles/wgs84/2/r3_c1.mapml
index a714e0fb2..4be428758 100644
--- a/test/e2e/data/tiles/wgs84/2/r3_c1.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r3_c1.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c2.mapml b/test/e2e/data/tiles/wgs84/2/r3_c2.mapml
index 19e9b4339..fd9d87292 100644
--- a/test/e2e/data/tiles/wgs84/2/r3_c2.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r3_c2.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c3.mapml b/test/e2e/data/tiles/wgs84/2/r3_c3.mapml
index 91bc7247a..fd9d87292 100644
--- a/test/e2e/data/tiles/wgs84/2/r3_c3.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r3_c3.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c4.mapml b/test/e2e/data/tiles/wgs84/2/r3_c4.mapml
index bee8e131e..30d0b76b0 100644
--- a/test/e2e/data/tiles/wgs84/2/r3_c4.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r3_c4.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c5.mapml b/test/e2e/data/tiles/wgs84/2/r3_c5.mapml
index 55c4f6c44..30d0b76b0 100644
--- a/test/e2e/data/tiles/wgs84/2/r3_c5.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r3_c5.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c6.mapml b/test/e2e/data/tiles/wgs84/2/r3_c6.mapml
index c6505ff66..94d2803b6 100644
--- a/test/e2e/data/tiles/wgs84/2/r3_c6.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r3_c6.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c7.mapml b/test/e2e/data/tiles/wgs84/2/r3_c7.mapml
index a2ce8bc52..94d2803b6 100644
--- a/test/e2e/data/tiles/wgs84/2/r3_c7.mapml
+++ b/test/e2e/data/tiles/wgs84/2/r3_c7.mapml
@@ -4,34 +4,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-
-
-
-
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-
-