diff --git a/app.js b/app.js
index 65f9b5f..f992a35 100644
--- a/app.js
+++ b/app.js
@@ -7,15 +7,12 @@ App({
   newsUrl: 'https://www.wgink.ink/news',
   newsContentUrl: 'https://www.wgink.ink',
   libraryUrl: 'https://www.wgink.ink/library',
-<<<<<<< HEAD
-  venueUrl: 'http://192.168.0.109:8082/venuebooking',
-  activityUrl: 'http://192.168.0.111:8080/culturalactivity',
-  volunteerUrl: 'https://www.wgink.ink/volunteer',
-=======
   venueUrl: 'https://www.wgink.ink/venuebooking',
-  activityUrl: 'http://192.168.0.111:8080/culturalactivity',
-  volunteerUrl: 'http://192.168.0.111:8888/volunteer',
->>>>>>> 8555f8c2cd310ce9fdc19a34346841205d404f1a
+  activityUrl: 'https://www.wgink.ink/culturalactivity',
+  volunteerUrl: 'https://www.wgink.ink/volunteer',
+  venueUrl: 'https://www.wgink.ink/venuebooking',
+  activityUrl: 'https://www.wgink.ink/culturalactivity',
+  volunteerUrl: 'https://www.wgink.ink/volunteer',
   liveUrl: 'https://www.wgink.ink/live',
   liveRecordUrl: 'https://www.wgink.ink',
   socialUrl: 'https://www.wgink.ink/social',