fixed conflict in gem file