Gemfile.lock conflicts, remove heads and rebundle