Merged PingPong with developer