corrected conflict version of gems