diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index a7bd239ee..ab79ac67a 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -2,7 +2,7 @@
  - Replaced defective confirm checkout commerce template.
  - Fixed a typo in the Navigation table schema.
  - fix [ 1160019 ] Notification content type [temp fix] <mwilson's fixes>
- - fix [ 1173544 ] Rating increases view count [mwilson]
+ - fix [ 1173544 ] Rating increases view count
  - fix [ 1177020 ] Preview, then Save a Post -subscribers get two notifications
  - fix [ 1178367 ] Edit Shortcut doesn't work with wobjects without templateId
  - fix [ 1180455 ] assetproxy of a nonexistent asset inserts the page_not_found
@@ -33,6 +33,8 @@
  - fix [ 1204123 ] Bug: sortby.lastreply.url
  - fix [ 1203779 ] "Remove" Button in FileUploadControl not internationalized
  - fix [ 1201650 ] Server-wide Cache can be viewed/cleared by an admin
+ - fix [ 1197095 ] runHourly not finishing
+
 
 6.6.0
  - Added a shopping cart system and salable products management system. This
diff --git a/docs/upgrades/upgrade_6.6.0-6.6.1.sql b/docs/upgrades/upgrade_6.6.0-6.6.1.sql
index ec6525cc4..3492c9d35 100644
--- a/docs/upgrades/upgrade_6.6.0-6.6.1.sql
+++ b/docs/upgrades/upgrade_6.6.0-6.6.1.sql
@@ -3,4 +3,4 @@ insert into settings values ('commerceSendDailyReportTo', '');
 alter table Navigation change anscestorEndPoint ancestorEndPoint int not null default 55;
 alter table groups add ldapGroup varchar(255) default NULL;
 alter table groups add ldapGroupProperty varchar(255) default NULL;
-alter table groups add ldapRecursiveProperty varchar(255) default NULL; >>>>>>> 1.4
+alter table groups add ldapRecursiveProperty varchar(255) default NULL;