pong: checkpoint commit
pong: merge conflict