diff --git a/levels/conflict/description b/levels/conflict/description
new file mode 100644
index 0000000..8ff892a
--- /dev/null
+++ b/levels/conflict/description
@@ -0,0 +1,3 @@
+Try merging the two branches together!
+
+    git merge <otherbranch>
diff --git a/levels/conflict/start b/levels/conflict/start
new file mode 100644
index 0000000..14de5f4
--- /dev/null
+++ b/levels/conflict/start
@@ -0,0 +1,12 @@
+echo ? > bikeshed_color
+git add .
+git commit -m "Initial commit"
+
+echo green > bikeshed_color
+git commit -a -m "My suggestion"
+
+git switch -c alternative HEAD^
+echo blue > bikeshed_color
+git commit -a -m "This is way better"
+
+git switch main