bump fem and remove manual patches for it