providers/docker: make merge logic a bit more sensible