add rest-client gem
fix merge error