fix conflicts with some gem
update