diff --git a/ionic/components/tap-click/tap-click.ts b/ionic/components/tap-click/tap-click.ts
index 4e8a23d04d..9841fd7e0e 100644
--- a/ionic/components/tap-click/tap-click.ts
+++ b/ionic/components/tap-click/tap-click.ts
@@ -144,15 +144,12 @@ function moveListeners(shouldAdd) {
   }
 }
 
-<<<<<<< HEAD
-=======
 function setDisableNativeClick() {
   if (isTapPolyfill) {
     disableNativeClickTime = Date.now() + disableNativeClickLimit;
   }
 }
 
->>>>>>> master
 function isDisabledNativeClick() {
   return disableNativeClickUntil > Date.now();
 }