1 files changed, 22 insertions, 0 deletions
diff --git a/conflicts.txt b/conflicts.txt
new file mode 100644
index 0000000..1d7a968
--- /dev/null
+++ b/conflicts.txt
@@ -0,0 +1,22 @@
+---
+soup: bean soup, tomato soup, squash soup
+curry: chickpea curry, mj curry
+potato: mash, jacket beans
+greens: ramen, fast ramen, stir fry
+tomato: tomato soup, mj spghet, mj curry
+meat: chilli, gurger
+beans: bean soup, chilli
+
+bean soup: soup, beans
+tomato soup: soup, tomato
+squash soup: soup
+chickpea curry: curry
+mj curry: curry, tomato
+mash: potato
+jacket beans: potato
+ramen: greens
+fast ramen: greens
+stir fry: greens
+mj spghet: tomato
+chilli: meat, beans
+gurger: meat