Not with a formal agreement
A large share of workplace conflicts never reach a tidy mutual resolution. Instead they fade as one side avoids the issue, withdraws, or simply moves on. Strategic disengagement is a legitimate and common way conflicts wind down.
