Fix build broken by silent merge conflicts