minor after-merge fix