Fix corrupted merge