Fix conflicts

  In Gemfile:
    rails (= 3.2.11) ruby depends on
      builder (~> 3.0.0) ruby

    savon (>= 0) ruby depends on
      builder (2.1.2)