Add pong demo
fix merge conflict