net/ipv4/ping.c: fix merge conflict