Manually fix automerger error on 4ab7548

* commit '4ab7548':
  init: Add support for ${x.y:-default} expansion