diff --git a/clean_files.txt b/clean_files.txt
index 0d57ca3e..b39ec66b 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -105,7 +105,11 @@ 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