pool duel update
Merge branch 'dev'