k way merge fix