diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf211e387..1f31008a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+<<<<<<< HEAD
 ### Added
  * Wallet Encryption/Decryption user flows ([#1785](https://github.com/lbryio/lbry-desktop/pull/1785))
  * Add FAQ to Publishing Area ([#1833](https://github.com/lbryio/lbry-desktop/pull/1833))
@@ -19,6 +20,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
  * Use router pattern for rendering file viewer ([#1544](https://github.com/lbryio/lbry-desktop/pull/1544))
  * Missing word "to" added to the Bid Help Text (#1854)
  * Updated to electron@2 ([#1858](https://github.com/lbryio/lbry-desktop/pull/1858))
+=======
+### Changed
+ * Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
+
+## [0.23.1] - 2018-08-01
+
+### Fixed
+  * Fix ShapeShift integration ([#1842](https://github.com/lbryio/lbry-desktop/pull/1842))
+
+
+## [0.23.0] - 2018-07-25
+>>>>>>> add thumbnail label for disabled publish button
 
 ### Fixed
  * **Wallet -> Get Credits** page now shows correct ShapeShift status when it's avialable ([#1836](https://github.com/lbryio/lbry-desktop/issues/1836))
diff --git a/src/renderer/component/publishForm/view.jsx b/src/renderer/component/publishForm/view.jsx
index 5fa4f9a25..76a8a96ff 100644
--- a/src/renderer/component/publishForm/view.jsx
+++ b/src/renderer/component/publishForm/view.jsx
@@ -258,7 +258,14 @@ class PublishForm extends React.PureComponent<Props> {
     } = this.props;
 
     // If they are editing, they don't need a new file chosen
-    const formValidLessFile = name && !nameError && title && bid && !bidError && tosAccepted && !(uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS);
+    const formValidLessFile =
+      name &&
+      !nameError &&
+      title &&
+      bid &&
+      !bidError &&
+      tosAccepted &&
+      !(uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS);
     return editingURI && !filePath ? isStillEditing && formValidLessFile : formValidLessFile;
   }
 
@@ -291,6 +298,9 @@ class PublishForm extends React.PureComponent<Props> {
           {uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS
           && <div>{__('Please wait for thumbnail to finish uploading')}</div>}
           {!tosAccepted && <div>{__('You must agree to the terms of service')}</div>}
+          {uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS && (
+            <div>{__('Please wait for thumbnail to finish uploading')}</div>
+          )}
           {!!editingURI &&
             !isStillEditing &&
             !filePath && <div>{__('You need to reselect a file after changing the LBRY URL')}</div>}