resolving office disputes