Meredith used the accommodating style of conflict resolution.
Meredith wanted to stop her fight with Sally, and thus she gave in to Sally's decision to design the interior of their restaurant. She did have opposing ideas initially, but in order to solve the problem, she accepted Sally's wishes and discarded her own so as to avoid further fighting.