More merge-ish updates