diff --git a/tests/Fixer/Comment/HeaderCommentFixerTest.php b/tests/Fixer/Comment/HeaderCommentFixerTest.php
index 5fa44e528aa..c808b67d597 100644
--- a/tests/Fixer/Comment/HeaderCommentFixerTest.php
+++ b/tests/Fixer/Comment/HeaderCommentFixerTest.php
@@ -13,12 +13,8 @@
 namespace PhpCsFixer\Tests\Fixer\Comment;
 
 use PhpCsFixer\ConfigurationException\InvalidFixerConfigurationException;
-<<<<<<< Updated upstream
-use PhpCsFixer\Tests\Test\AbstractFixerWithAliasedOptionsTestCase;
-=======
 use PhpCsFixer\Fixer\Comment\HeaderCommentFixer;
-use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
->>>>>>> Stashed changes
+use PhpCsFixer\Tests\Test\AbstractFixerWithAliasedOptionsTestCase;
 use PhpCsFixer\WhitespacesFixerConfig;
 
 /**