fix merging issues

2 files changed, 2 insertions, 5 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 = {
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 4a37bad57..a7136c43f 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -111,8 +111,8 @@ class TabItem extends Component {
         : intl.formatMessage(messages.disableAudio),
       click: () => toggleAudio(),
     }, {
-      label: intl.formatMessage(messages.disableService),
-      click: () => disableService(),
+      label: intl.formatMessage(service.isEnabled ? messages.disableService : messages.enableService),
+      click: () => (service.isEnabled ? disableService() : enableService()),
     }, {
       type: 'separator',
     }, {