fix gem file
fix conflick