diff --git a/services/m=news/archives/latest.html b/services/m=news/archives/latest.html
index 453f37be0..1bf0e837d 100644
--- a/services/m=news/archives/latest.html
+++ b/services/m=news/archives/latest.html
@@ -210,7 +210,11 @@ $("#play, #playExisting, #playBannerNoad").each(function(){ this.href += "?j=1";
 
     <b><u>Bug Fixes</u></b>
         <ul>
+<<<<<<< HEAD
           <li>Explorer ring 3 is now obtainable</li>
+=======
+            <li>Exporer's ring 3 is once again obtainable.</li>
+>>>>>>> fd506095de66cefd7d4ead132a5170da83682679
             <li>Fixed the Fruit Trees.</li>
             <li>Fixed Wildblood seeds</li>
             <li>Avantoe patches no longer turn into weeds.</li>