bundle update again and resolve stupid Gemfile.lock conflicts