fixin Gemfile.lock conflicts