fix merge conflict in ping