Merge pull request from more-oil

Add more oil so the cake is more moist!
Resolve oil conflict