Fixed mere conflict in gemfile