Fixed merge conflicts in the gem files