gem conflicts fixed