diff --git a/02/src/App.js b/02/src/App.js
index 870bee18..009d74c6 100644
--- a/02/src/App.js
+++ b/02/src/App.js
@@ -151,8 +151,7 @@ class App extends React.Component {
       );
 
       style.backgroundColor = "red";
-<<<<<<< HEAD
-=======
+
     }
 
     let classes = [];
@@ -161,18 +160,14 @@ class App extends React.Component {
     }
     if (this.state.character.length <= 1) {
       classes.push('bold');
->>>>>>> 07c583587442782ee7aeef672dd58c907f53437c
     }
 
     return (
       <div className="App">
         <h1>Hi, I'm a React App, I'm cute.</h1>
-<<<<<<< HEAD
         <p>Created using OOP code</p>
-=======
         <p className={classes.join(' ')}>Created using OOP code</p>
         <p style={{color: 'blue'}}>And this is a little test in styling</p>
->>>>>>> 07c583587442782ee7aeef672dd58c907f53437c
         <button
           style={style} // <- putting in the CSS directives set above
           onClick={() => console.log('"CLICK"')}