Don't fix merge conflicts on Github.

src/assets/translations.data.json

@@ -113,7 +113,7 @@
     "spoke.browse_all_versions": "Browse All Versions",
     "spoke.close": "Close",
     "spoke.beginner_tutorial_button": "Learn Spoke in 5 Minutes",
-    "spoke.advanced_tutorial_button": "Advanced Spoke in 10 minutes"
+    "spoke.advanced_tutorial_button": "Advanced Spoke in 10 minutes",
     "spoke.play_button": "Learn Spoke in 5 Minutes",
     "commands.fly": "Toggle fly mode.",
     "commands.bigger": "Increase your avatar's size.",