Change the name of the gem
Fix conflict