diff --git a/.gitignore b/.gitignore
index cd021ec..712790b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,7 @@
 
 ### resources ###
 /src/main/resources
+<<<<<<< HEAD   (4d9ffd Restructured ThesaurusDictionary.java to allow for tests, ad)
+=======
+/data
+>>>>>>> CHANGE (22653c Moved data update functionality from REST to CLI. Added opti)