diff --git a/src/backport.ts b/src/backport.ts
index 5b4b8b3..79dd41d 100644
--- a/src/backport.ts
+++ b/src/backport.ts
@@ -404,7 +404,7 @@ export class Backport {
     );
     return dedent`Backport failed for \`${target}\`, ${reason}.
 
-                  Please cherry-pick the changes locally.
+                  Please cherry-pick the changes locally and resolve any conflicts.
                   ${suggestion}`;
   }