pushing gem to rubygems finally works
fixed conflicts