add ping route
committing local change
resolved merge conflict