Fix hangover of merge