fixed gem conflict files