diff --git a/docs/news/index.html b/docs/news/index.html
index 313cf1b1..762c676f 100644
--- a/docs/news/index.html
+++ b/docs/news/index.html
@@ -111,11 +111,7 @@ <h1>Changelog <small></small></h1>
 
     <div id="nasapower-105" class="section level1">
 <h1 class="page-header">
-<<<<<<< HEAD
-<a href="#nasapower-104" class="anchor"></a>nasapower 1.0.4<small> 2019-01-08 </small>
-=======
-<a href="#nasapower-105" class="anchor"></a>nasapower 1.0.5<small> Unreleased </small>
->>>>>>> devel
+<a href="#nasapower-105" class="anchor"></a>nasapower 1.0.5<small> 2019-02-02 </small>
 </h1>
 <div id="minor-changes" class="section level2">
 <h2 class="hasAnchor">