diff --git a/clean_files.txt b/clean_files.txt
index b39ec66b..1d64c681 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -105,11 +105,7 @@ aliases/available/vim.aliases.bash
 aliases/available/git.aliases.bash
 
 # tests
-<<<<<<< Updated upstream
 test/plugins/alias-completion.plugin.bats
-=======
-test/alias-completion.plugin.bats
->>>>>>> Stashed changes
 test/test_helper.bash
 
 # vendor init files