remove conflict markers. added rake to gemfile.

using Ruby 2.1.0, could not build without adding rake to gemfile