merge fix-up