added ability to ping oneself
fix merge conflict