mostly fixed pong
resolve merge conflict