diff --git a/www/push.js b/www/push.js
index bd02c9a80..03f02e643 100644
--- a/www/push.js
+++ b/www/push.js
@@ -1,14 +1,8 @@
 /**
 * This file has been generated by Babel.
-<<<<<<< HEAD
-*
+* 
 * DO NOT EDIT IT DIRECTLY
-*
-=======
-*
-* DO NOT EDIT IT DIRECTLY
-*
->>>>>>> 974d2e218bcc8ab8ebf779ef18df74622702eb0e
+* 
 * Edit the JS source file src/js/push.js
 **/'use strict';
 
@@ -378,4 +372,4 @@ module.exports = {
    * .init helper method.
    */
   PushNotification: PushNotification
-};
+};
\ No newline at end of file