diff --git a/crates/gitbutler-core/src/virtual_branches/virtual.rs b/crates/gitbutler-core/src/virtual_branches/virtual.rs
index 9ea3ddd18..1314b2c35 100644
--- a/crates/gitbutler-core/src/virtual_branches/virtual.rs
+++ b/crates/gitbutler-core/src/virtual_branches/virtual.rs
@@ -361,16 +361,9 @@ pub fn apply_branch(
                         last_rebase_head = oid;
                     }
                 }
-                Err(err)
-                    if err
-                        .downcast_ref()
-                        .map_or(false, |marker: &Marker| *marker == Marker::ProjectConflict) =>
-                {
+                Err(_) => {
                     rebase_success = false;
                 }
-                Err(err) => {
-                    return Err(err).context("failed to apply branch");
-                }
             }
 
             if rebase_success {