gem conflicts resolved: