fixed gemfile merge conflict on rest_client