remove 2 more oil, keep only 1 more oil, make it different from remote
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt