fixed gem conflicts