More merge conflicts?

Author: tonyito

src/components/Rectangle.tsx

@@ -167,9 +167,17 @@ class Rectangle extends Component<PropsInt, StateInt> {
           draggable={false}
           fill={null}
           shadowBlur={childId === -1 ? 6 : null}
+<<<<<<< HEAD
           fillPatternImage={this.state.image ? this.state.image : null}
           fillPatternScaleX={this.state.image ? width / this.state.image.width : 1}
           fillPatternScaleY={this.state.image ? height / this.state.image.height : 1}
+=======
+
+          fillPatternImage={this.state.image ? this.state.image : null}
+          fillPatternScaleX={this.state.image ? width / this.state.image.width : 1}
+          fillPatternScaleY={this.state.image ? height / this.state.image.height : 1}
+
+>>>>>>> e51db579b0759ac9d502e6bfaea52067bd942eb6
           _useStrictMode
         />
         <Label>

src/containers/LeftContainer.tsx

@@ -163,12 +163,19 @@ class LeftContainer extends Component<PropsInt, StateInt> {
     this.chooseAppDir();
   };
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   chooseAppDir = () => IPC.send("choose_app_dir");
   addImage = () => IPC.send('update-file');
 =======
   chooseAppDir = () => IPC.send('choose_app_dir');
 >>>>>>> 5b06f9594f8f844e2ac13ae8e5c94fa9d71dfd80
+=======
+
+  chooseAppDir = () => IPC.send("choose_app_dir");
+  addImage = () => IPC.send('update-file');
+
+>>>>>>> e51db579b0759ac9d502e6bfaea52067bd942eb6
 
   showGenerateAppModal = () => {
     const { closeModal, chooseGenOptions } = this;