diff --git a/js/components/edition_container.js b/js/components/edition_container.js
index de886360..1f2461bd 100644
--- a/js/components/edition_container.js
+++ b/js/components/edition_container.js
@@ -51,12 +51,8 @@ let EditionContainer = React.createClass({
                 <Edition
                     edition={this.state.edition}
                     currentUser={this.state.currentUser}
-<<<<<<< HEAD
-                    deleteEdition={this.deleteEdition}/>
-=======
                     deleteEdition={this.deleteEdition}
                     savePersonalNote={this.savePersonalNote}/>
->>>>>>> AD-43-in-piece_detail-add-generic-field-
             );
         } else {
             return (