Conflicts:
pkgs/development/compilers/adoptopenjdk-bin/sources.json
-- keep newer adoptopenjdk versions from HEAD^2
Conflicts:
pkgs/development/compilers/adoptopenjdk-bin/sources.json
-- keep newer adoptopenjdk versions from HEAD^2