The return-to-office war may finally be reaching a compromise