When discussing Rebbi Shimon’s opinion on Muktza, the Gemara begins by stating that he only applies Muktza to oil in a Shabbos lamp on account of its Mitzva designation.  Further down the Gemara states that he only applies Muktza to figs and grapes; are these two statements contradictory?