merge fix

Author: AGulev

main/main.collection

@@ -196,3 +196,28 @@ embedded_instances {
     y: 158.0
   }
 }
+embedded_instances {
+  id: "physics"
+  data: "components {\n"
+  "  id: \"phisics\"\n"
+  "  component: \"/main/physics.script\"\n"
+  "}\n"
+  "embedded_components {\n"
+  "  id: \"spinemodel\"\n"
+  "  type: \"spinemodel\"\n"
+  "  data: \"spine_scene: \\\"/assets/trophy_wingame_spine/trophy_wingame_spine.spinescene\\\"\\n"
+  "default_animation: \\\"\\\"\\n"
+  "skin: \\\"\\\"\\n"
+  "material: \\\"/defold-spine/assets/spine.material\\\"\\n"
+  "\"\n"
+  "}\n"
+  ""
+  position {
+    x: 741.0
+    y: 447.0
+  }
+  scale3 {
+    x: 0.1
+    y: 0.1
+  }
+}