diff --git a/.Rbuildignore b/.Rbuildignore
index 3ed9b81..913cbc6 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -2,4 +2,8 @@
 ^\.Rproj\.user$
 ^LICENSE\.md$
 ^\.github$
+<<<<<<< HEAD
 ^misc$
+=======
+^misc$
+>>>>>>> b1fce5ac678b1f125c0aa460a8145c4686616376