Matt Barnes, Derek Fisher appear to have buried the hatchet