Fix some gem conflicts from ancient merge