1 files changed, 0 insertions, 3 deletions

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 08ba5f33d..abbf21dee 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -16,11 +16,8 @@ export default class ServiceWebview extends Component {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
-<<<<<<< HEAD
     isAppMuted: PropTypes.bool.isRequired,
-=======
     enable: PropTypes.func.isRequired,
->>>>>>> develop
   };
 
   static defaultProps = {