diff --git a/.Rbuildignore b/.Rbuildignore
index d4e9d78..00858d7 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -10,8 +10,5 @@ $run_dev.*
 ^\.github$
 ^surveyDesigner\.Rproj$
 ^docs$
-<<<<<<< HEAD
 ^app\.R$
-=======
->>>>>>> 5d46f08550c1eb5c6e5e288d470fff79faa8a585
 ^rsconnect$