yes

Author: landonwjohnson

src/components/Paola.js

@@ -0,0 +1,10 @@
+import React, { Component } from 'react';
+
+
+ export default class Paola extends Component {
+  render() {
+    return (
+      <div>Paola</div>
+    );
+  }
+}

src/components/app.js

@@ -1,8 +1,12 @@
 import React, { Component } from 'react';
 import Alex from './alex'
 <<<<<<< HEAD
+<<<<<<< HEAD
 import Landon from './landon'
 =======
+=======
+import Paola from './Paola'
+>>>>>>> 96a75e9d6dc1b4afe2dc0a8aa432e6c65d93c573
 import Jared from './jared'
 import Josh from './josh'
 >>>>>>> f6eb50240b5e773dd29bb94a75e5f37a41db9347
@@ -13,10 +17,17 @@ import Josh from './josh'
       <div>
         <h1>React Simple Starter</h1>
           <Alex />
+<<<<<<< HEAD
 <<<<<<< HEAD
           <Landon />
 =======
+=======
+
+          <Paola/>
+
+>>>>>>> 96a75e9d6dc1b4afe2dc0a8aa432e6c65d93c573
           <Jared />
+
           <Josh/>
 >>>>>>> f6eb50240b5e773dd29bb94a75e5f37a41db9347
       </div>