diff --git a/website/client/src/components/notifications.vue b/website/client/src/components/notifications.vue
index f60127e300..94b30663dc 100644
--- a/website/client/src/components/notifications.vue
+++ b/website/client/src/components/notifications.vue
@@ -175,7 +175,6 @@ const NOTIFICATIONS = {
     label: $t => `${$t('achievement')}: ${$t('achievementAridAuthority')}`,
     modalId: 'generic-achievement',
   },
-<<<<<<< HEAD:website/client/src/components/notifications.vue
   ACHIEVEMENT_PARTY_UP: {
     achievement: true,
     label: $t => `${$t('achievement')}: ${$t('achievementPartyUp')}`,
@@ -213,7 +212,6 @@ const NOTIFICATIONS = {
       modalText: $t => $t('triadBingoAchievement'),
     },
   },
-=======
   ACHIEVEMENT_MONSTER_MAGUS: {
     achievement: true,
     label: ($t) => `${$t('achievement')}: ${$t('achievementMonsterMagus')}`,
@@ -224,7 +222,6 @@ const NOTIFICATIONS = {
     label: ($t) => `${$t('achievement')}: ${$t('achievementUndeadUndertaker')}`,
     modalId: 'generic-achievement',
   },
->>>>>>> release:website/client/components/notifications.vue
 };
 
 export default {
@@ -279,14 +276,9 @@ export default {
       'ULTIMATE_GEAR_ACHIEVEMENT', 'REBIRTH_ACHIEVEMENT', 'GUILD_JOINED_ACHIEVEMENT',
       'CHALLENGE_JOINED_ACHIEVEMENT', 'INVITED_FRIEND_ACHIEVEMENT', 'NEW_CONTRIBUTOR_LEVEL',
       'CRON', 'SCORED_TASK', 'LOGIN_INCENTIVE', 'ACHIEVEMENT_ALL_YOUR_BASE', 'ACHIEVEMENT_BACK_TO_BASICS',
-<<<<<<< HEAD:website/client/src/components/notifications.vue
       'GENERIC_ACHIEVEMENT', 'ACHIEVEMENT_PARTY_UP', 'ACHIEVEMENT_PARTY_ON', 'ACHIEVEMENT_BEAST_MASTER',
       'ACHIEVEMENT_MOUNT_MASTER', 'ACHIEVEMENT_TRIAD_BINGO', 'ACHIEVEMENT_DUST_DEVIL', 'ACHIEVEMENT_ARID_AUTHORITY',
-=======
-      'ACHIEVEMENT_DUST_DEVIL', 'ACHIEVEMENT_ARID_AUTHORITY',
-      'ACHIEVEMENT_MONSTER_MAGUS', 'ACHIEVEMENT_UNDEAD_UNDERTAKER',
-      'GENERIC_ACHIEVEMENT',
->>>>>>> release:website/client/components/notifications.vue
+      'ACHIEVEMENT_MONSTER_MAGUS', 'ACHIEVEMENT_UNDEAD_UNDERTAKER', 'GENERIC_ACHIEVEMENT',
     ].forEach(type => {
       handledNotifications[type] = true;
     });
@@ -685,16 +677,13 @@ export default {
           case 'ACHIEVEMENT_BACK_TO_BASICS':
           case 'ACHIEVEMENT_DUST_DEVIL':
           case 'ACHIEVEMENT_ARID_AUTHORITY':
-<<<<<<< HEAD:website/client/src/components/notifications.vue
           case 'ACHIEVEMENT_PARTY_UP':
           case 'ACHIEVEMENT_PARTY_ON':
           case 'ACHIEVEMENT_BEAST_MASTER':
           case 'ACHIEVEMENT_MOUNT_MASTER':
           case 'ACHIEVEMENT_TRIAD_BINGO':
-=======
           case 'ACHIEVEMENT_MONSTER_MAGUS':
           case 'ACHIEVEMENT_UNDEAD_UNDERTAKER':
->>>>>>> release:website/client/components/notifications.vue
           case 'GENERIC_ACHIEVEMENT':
             this.showNotificationWithModal(notification);
             break;
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 93e533def8..374e2d0a44 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -2,7 +2,8 @@ import { authWithHeaders } from '../../middlewares/auth';
 
 const api = {};
 
-// @TODO export this const, cannot export it from here because only routes are exported from controllers
+// @TODO export this const, cannot export it from here because only routes are exported from
+// controllers
 const LAST_ANNOUNCEMENT_TITLE = 'NEW PET COLLECTION BADGES!';
 const worldDmg = { // @TODO
   bailey: false,
@@ -35,8 +36,12 @@ api.getNews = {
         </div>
         <hr/>
         <div class="promo_zombie_achievements center-block"></div>
-        <p>We're releasing a new achievement so you can celebrate your successes in the world of Habitican pet collecting! Earn the Monster Magus and Undead Undertaker achievements by collecting Zombie pets and mounts and you'll earn a nifty badge for your profile.</p>
-        <p>If you already have all the Zombie pets and/or mounts in your stable, you'll receive the badge automatically! Check your profile and celebrate your new achievement with pride.</p>
+        <p>We're releasing a new achievement so you can celebrate your successes in the world of
+        Habitican pet collecting! Earn the Monster Magus and Undead Undertaker achievements by
+        collecting Zombie pets and mounts and you'll earn a nifty badge for your profile.</p>
+        <p>If you already have all the Zombie pets and/or mounts in your stable, you'll receive
+        the badge automatically! Check your profile and celebrate your new achievement with
+        pride.</p>
         <div class="small mb-3">By OuttaMyMind and SabreCat</div>
       </div>
       `,