diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index ae17688190..bcb6f4cde7 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -86,12 +86,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
-<<<<<<< HEAD
-			$filesystem,
 			$this->createMock('\phpbb\request\request'),
-=======
-			$this->getMock('\phpbb\request\request'),
->>>>>>> [ticket/15253] Use storage helper methods instead of filesystem methods
 			$phpbb_root_path,
 			$phpEx
 		);