fix some merge derps