Changed vegetable oil to olive oil.
Conflict resolution