conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index e418a6f3c..bf72dbdba 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -131,7 +131,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
         const title = (() => {
             switch (this.openHover) {
                 default:
-                case UtilityButtonState.Default: return `${!dataDoc?.unchanged ? "Pull from" : "Fetch"} Google Docs`;
+                case UtilityButtonState.Default: return `${!dataDoc?.googleDocUnchanged ? "Pull from" : "Fetch"} Google Docs`;
                 case UtilityButtonState.OpenRight: return "Open in Right Split";
                 case UtilityButtonState.OpenExternally: return "Open in new Browser Tab";
             }
@@ -165,7 +165,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
                             this.clearPullColor();
                             PropertiesButtons.hasPulledHack = false;
                             targetDoc[Pulls] = NumCast(targetDoc[Pulls]) + 1;
-                            dataDoc.unchanged && runInAction(() => this.isAnimatingFetch = true);
+                            dataDoc.googleDocUnchanged && runInAction(() => this.isAnimatingFetch = true);
                         }
                     }}>
                     <FontAwesomeIcon className="documentdecorations-icon" size="lg" color="black"
@@ -173,7 +173,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
                         icon={(() => {
                             switch (this.openHover) {
                                 default:
-                                case UtilityButtonState.Default: return dataDoc.unchanged === false ? (this.pullIcon as any) : fetch;
+                                case UtilityButtonState.Default: return dataDoc.googleDocUnchanged === false ? (this.pullIcon as any) : fetch;
                                 case UtilityButtonState.OpenRight: return "arrow-alt-circle-right";
                                 case UtilityButtonState.OpenExternally: return "share";
                             }