Package Conflict Resolution UI

Fixes #42

Author: Sahilbhatane

.gitignore

@@ -151,8 +151,16 @@ htmlcov/
 *.swo
 
 # ==============================
-# Cortex specific
+# Cortex-specific
 # ==============================
+# User preferences and configuration
 .cortex/
 *.yaml.bak
+~/.config/cortex/preferences.yaml
+~/.config/cortex/*.backup.*
 /tmp/
+
+# Data files (except contributors.json which is tracked)
+data/*.json
+data/*.csv
+!data/contributors.json