Fixed merge conflicts with tansaku's gemfile.lcok