diff --git a/src/client/components/FacetDialog.js b/src/client/components/FacetDialog.js
index 744c1f4a2bf161e6e8e42342982dc05034568557..3ebe96606c6b9b16eeabcd355938da57e444ce50 100644
--- a/src/client/components/FacetDialog.js
+++ b/src/client/components/FacetDialog.js
@@ -26,19 +26,11 @@ class FacetDialog extends React.Component {
     this.props.fetchFacet();
   }
 
-<<<<<<< HEAD
   // componentDidUpdate = prevProps => {
   //   if (prevProps.facet.facetFilters != this.props.facet.facetFilters) {
   //     this.props.fetchFacet();
   //   }
   // }
-=======
-  componentDidUpdate = prevProps => {
-    if (prevProps.facet.facetFilters != this.props.facet.facetFilters) {
-      this.props.fetchFacet();
-    }
-  }
->>>>>>> 467c1d7b0260ffc7ff809f4a630fa873a05f66dc
 
   handleClose = () => this.props.closeFacetDialog();