location with uuids
fixed conflicts in price list merge