local merge fix