Merge fix up