Remove an unreachable line left over from merge