diff --git a/levels/conflict.rb b/levels/conflict.rb
index 7c0ac0d..aa20f37 100644
--- a/levels/conflict.rb
+++ b/levels/conflict.rb
@@ -3,6 +3,7 @@
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do