fixed gemfile lock conflicts