fixed gem conflict