Correcting leftover from conflict merging.