resolve merge conflict

src/stories/button.css

@@ -9,7 +9,7 @@
 }
 .storybook-button--primary {
   color: white;
-  background-color: palegoldenrod;
+  background-color: greenyellow;
 }
 .storybook-button--secondary {
   color: #333;