diff --git a/apps/messageicons/icons/icon_names.json b/apps/messageicons/icons/icon_names.json
index 13aa0de27..9de312228 100644
--- a/apps/messageicons/icons/icon_names.json
+++ b/apps/messageicons/icons/icon_names.json
@@ -119,17 +119,8 @@
   { "app":"zoom", "icon":"videoconf.png" },
   { "app":"meet", "icon":"videoconf.png" },
   { "app":"music", "icon":"music.png" },
-<<<<<<< HEAD
   { "app":"sms message", "icon":"message.png" },
-    { "app":"qksms", "icon":"message.png" },
+  { "app":"qksms", "icon":"message.png" },
   { "app":"mail", "icon":"default.png" },
-	{ "app":"gmail", "icon":"default.png" }
-||||||| e51f7bfbe
-  { "app":"sms message", "icon":"default.png" },
-	{ "app":"mail", "icon":"default.png" },
-	{ "app":"gmail", "icon":"default.png" }
-=======
-  { "app":"sms message", "icon":"default.png" },
-  { "app":"mail", "icon":"default.png" }
->>>>>>> bc375c512b0fc15ca033851245c9137656001c54
+  { "app":"gmail", "icon":"default.png" }
 ]
diff --git a/apps/messageicons/lib.js b/apps/messageicons/lib.js
index 85a99e424..2b0748bf6 100644
--- a/apps/messageicons/lib.js
+++ b/apps/messageicons/lib.js
@@ -4,13 +4,7 @@ exports.getImage = function(msg) {
   if (msg.img) return atob(msg.img);
   let s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   if (msg.id=="music") s="music";
-<<<<<<< HEAD
-  let match = ",default|0,airbnb|1,alarm|2,alarmclockreceiver|2,amazon shopping|3,bibel|4,bitwarden|5,1password|5,lastpass|5,dashlane|5,bring|6,calendar|7,etar|7,chat|8,chrome|9,clock|2,corona-warn|10,bmo|11,desjardins|11,rbc mobile|11,nbc|11,rabobank|11,scotiabank|11,td (canada)|11,discord|12,drive|13,element|14,facebook|15,messenger|16,firefox|17,firefox beta|17,firefox nightly|17,f-droid|5,neo store|5,aurora droid|5,github|18,gitlab|19,gmx|20,google|21,google home|22,google play store|23,home assistant|24,instagram|25,jira|26,kalender|27,keep notes|28,lieferando|29,linkedin|30,maps|31,organic maps|31,osmand|31,mastodon|32,fedilab|32,tooot|32,tusky|32,mattermost|33,n26|34,netflix|35,news|36,cbc news|36,rc info|36,reuters|36,ap news|36,la presse|36,nbc news|36,nextbike|37,nina|38,outlook mail|39,paypal|40,phone|41,plex|42,pocket|43,post & dhl|44,proton mail|45,reddit|46,sync pro|46,sync dev|46,boost|46,infinity|46,slide|46,signal|47,skype|48,slack|49,snapchat|50,starbucks|51,steam|52,teams|53,telegram|54,telegram foss|54,threema|55,tiktok|56,to do|57,opentasks|57,tasks|57,transit|58,twitch|59,twitter|60,uber|61,lyft|61,vlc|62,warnapp|63,whatsapp|64,wordfeud|65,youtube|66,newpipe|66,zoom|67,meet|67,music|68,sms message|69,qksms|69,mail|0,gmail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
-||||||| e51f7bfbe
-  let match = ",default|0,airbnb|1,alarm|2,alarmclockreceiver|2,amazon shopping|3,bibel|4,bitwarden|5,1password|5,lastpass|5,dashlane|5,bring|6,calendar|7,etar|7,chat|8,chrome|9,clock|2,corona-warn|10,bmo|11,desjardins|11,rbc mobile|11,nbc|11,rabobank|11,scotiabank|11,td (canada)|11,discord|12,drive|13,element|14,facebook|15,messenger|16,firefox|17,firefox beta|17,firefox nightly|17,f-droid|5,neo store|5,aurora droid|5,github|18,gitlab|19,gmx|20,google|21,google home|22,google play store|23,home assistant|24,instagram|25,jira|26,kalender|27,keep notes|28,lieferando|29,linkedin|30,maps|31,organic maps|31,osmand|31,mastodon|32,fedilab|32,tooot|32,tusky|32,mattermost|33,n26|34,netflix|35,news|36,cbc news|36,rc info|36,reuters|36,ap news|36,la presse|36,nbc news|36,nextbike|37,nina|38,outlook mail|39,paypal|40,phone|41,plex|42,pocket|43,post & dhl|44,proton mail|45,reddit|46,sync pro|46,sync dev|46,boost|46,infinity|46,slide|46,signal|47,molly|47,skype|48,slack|49,snapchat|50,starbucks|51,steam|52,teams|53,telegram|54,telegram foss|54,threema|55,threema libre|55,tiktok|56,to do|57,opentasks|57,tasks|57,transit|58,twitch|59,twitter|60,uber|61,lyft|61,vlc|62,warnapp|63,whatsapp|64,wordfeud|65,youtube|66,newpipe|66,zoom|67,meet|67,music|68,sms message|0,mail|0,gmail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
-=======
   let match = ",default|0,airbnb|1,agenda|2,alarm|3,alarmclockreceiver|3,amazon shopping|4,bereal.|5,bibel|6,bitwarden|7,1password|7,lastpass|7,dashlane|7,bring|8,calendar|9,etar|9,chat|10,chrome|11,clock|3,corona-warn|12,bmo|13,desjardins|13,rbc mobile|13,nbc|13,rabobank|13,scotiabank|13,td (canada)|13,davx⁵|14,discord|15,drive|16,element|17,element x|17,facebook|18,messenger|19,firefox|20,firefox beta|20,firefox nightly|20,f-droid|7,neo store|7,aurora droid|7,github|21,gitlab|22,gmail|23,gmx|24,google|25,google home|26,google play store|27,home assistant|28,instagram|29,jira|30,kalender|31,keep notes|32,kleinanzeigen|33,leboncoin|34,lieferando|35,linkedin|36,maps|37,organic maps|37,osmand|37,mastodon|38,fedilab|38,tooot|38,tusky|38,mattermost|39,messages|40,n26|41,netflix|42,news|43,cbc news|43,rc info|43,reuters|43,ap news|43,la presse|43,nbc news|43,nextbike|44,nextcloud|45,nina|46,outlook mail|47,paypal|48,phone|49,plex|50,pocket|51,post & dhl|52,proton mail|53,reddit|54,sync pro|54,sync dev|54,boost|54,infinity|54,slide|54,signal|55,molly|55,skype|56,slack|57,snapchat|58,starbucks|59,steam|60,teams|61,telegram|62,telegram foss|62,threema|63,threema libre|63,thunderbird|64,tiktok|65,to do|66,opentasks|66,tasks|66,transit|67,twitch|68,twitter|69,uber|70,lyft|70,vlc|71,warnapp|72,whatsapp|73,wordfeud|74,youtube|75,newpipe|75,zoom|76,meet|76,music|77,sms message|0,mail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
->>>>>>> bc375c512b0fc15ca033851245c9137656001c54
   return require("Storage").read("messageicons.img", (match===null)?0:match[1]*76, 76);
 };
 
@@ -78,4 +72,4 @@ exports.getColor = function(msg,options) {
     "youtube": "#f00", // https://www.youtube.com/howyoutubeworks/resources/brand-resources/#logos-icons-and-colors
   }[s]||options.default;
 };
-  
\ No newline at end of file
+  
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 9a93f5000..42a44fb72 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -77,26 +77,11 @@ of 'Select Clock'
 	calibration was done.
 0.67: Rename 'Wake on BTN1/Touch' to 'Wake on Button/Tap' on Bangle.js 2
 0.68: Fix syntax error
-<<<<<<< HEAD
-0.69: Add unlock on X options. Wake on will now only be for turning lcd/backlight on and unlock will be for unlocking touchscreen.
-0.70: Bugfixes
-0.71: Rearange LCD menu order
-=======
 0.69: Add option to wake on double tap
 0.70: Fix load() typo
 0.71: Minor code improvements
-<<<<<<< HEAD
->>>>>>> 7a3e0d2e7e1acef8ad643a9b7cc35f240aab9488
-||||||| a038233fa
-=======
 0.72: Add setting for configuring BLE privacy
 0.73: Fix `const` bug / work with fastload
-<<<<<<< HEAD
-0.74: Add extra layer of checks before allowing a factory reset (fix #3476)
->>>>>>> e51f7bfbe795f5170372a863e76c82d382e66344
-||||||| e51f7bfbe
-0.74: Add extra layer of checks before allowing a factory reset (fix #3476)
-=======
 0.74: Add extra layer of checks before allowing a factory reset (fix #3476)
 0.75: Restore previous menu's scroll positions
 0.76: Add altitude calibration menu (and update README after menu changed)
@@ -106,4 +91,3 @@ of 'Select Clock'
 0.80: Add option to set LCD brightness to 0, keep default brightness at 1.
 0.81: Ensure 'Privacy' (address randomnisation) is only added for Bangle.js 2,
       and add warnings in documentation that it can cause connection issues
->>>>>>> bc375c512b0fc15ca033851245c9137656001c54