Fixed merge residue.