The default merge method lived only as a per-project map in client
settings, so it could not be set for an environment and overridden per
project like everything else. It becomes a nullable server key (null keeps
using the method last chosen on this device) in the project-scoped set.
Also unbreaks the fold test's typecheck: encode JSON through Schema and type
the assertions.