fixed etsy api thingy in environment.rb
fixed merge conflicts