diff --git a/.gitignore b/.gitignore
index bab3349708..b7da95d3f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,3 +162,7 @@ gradle-app.setting
 .DS_Store
 Thumbs.db
 android/libs/
+
+# ignored due to frequent branch conflicts.
+core/assets/logicids.dat
+core/assets/icons.icons.properties
\ No newline at end of file