Another post-merge fix