diff --git a/tests/functional/forum_style_test.php b/tests/functional/forum_style_test.php
index 7c7df32184..3533735056 100644
--- a/tests/functional/forum_style_test.php
+++ b/tests/functional/forum_style_test.php
@@ -48,15 +48,6 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
 		$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2');
 
 		$crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
-<<<<<<< HEAD
-		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
-
-		$crawler = self::request('GET', 'viewtopic.php?t=1');
-		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
-
-		$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
-		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
-=======
 		$this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
 
 		$crawler = self::request('GET', 'viewtopic.php?t=1');
@@ -64,7 +55,6 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
 
 		$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
 		$this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
->>>>>>> 33be5dc489... [ticket/16549] Move from assert[Not]Contains to assertString[Not]ContainsString
 
 		$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');
 		$this->delete_style(2, 'test_style');
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh
index 82cec22058..daa71bd8aa 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -40,9 +40,7 @@ cd phpBB
 php ../composer.phar install --dev --no-interaction
 if [ "$TRAVIS_PHP_VERSION" == "nightly" ]
 then
-	php ../composer.phar config minimum-stability dev \
-	&& php ../composer.phar config prefer-stable true \
-	&& php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \
-	&& php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-dependencies --ignore-platform-reqs
+	php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \
+	&& php ../composer.phar require misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-dependencies --ignore-platform-reqs
 fi
 cd ..