Mergin in Adam's latest changes