Adjusted configs checked against the originals and reverted/updated as appropriate.

At this point, the merged pack needs to be checked to confirm it loads into a new world safely.