diff --git a/.gitignore b/.gitignore
index 3125f3f9ca..6f412defba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,11 +140,8 @@ events.out*
 old_configs/*
 model_importers/*
 model_profiling/*
-<<<<<<< HEAD
 docs/source/TODO/*
-=======
-docs/*
->>>>>>> univnet
+docs/source/models/*
 .noseids
 .dccache
 log.txt