diff --git a/workspace-server/internal/handlers/workspace_provision.go b/workspace-server/internal/handlers/workspace_provision.go
index e95b03fb..d364de54 100644
--- a/workspace-server/internal/handlers/workspace_provision.go
+++ b/workspace-server/internal/handlers/workspace_provision.go
@@ -582,11 +582,7 @@ func (h *WorkspaceHandler) provisionWorkspaceCP(workspaceID, templatePath string
 	if err := h.envMutators.Run(ctx, workspaceID, envVars); err != nil {
 		log.Printf("CPProvisioner: env mutator failed for %s: %v", workspaceID, err)
 		db.DB.ExecContext(ctx, `UPDATE workspaces SET status = 'failed', last_sample_error = $2, updated_at = now() WHERE id = $1`,
-<<<<<<< HEAD
-			workspaceID, "plugin env mutator chain failed")
-=======
-			workspaceID, "provisioning failed")
->>>>>>> f9fff93 (fix(security): replace err.Error() leaks with prod-safe messages (#1206))
+				workspaceID, "plugin env mutator chain failed")
 		return
 	}