Add player move event.
Fix merge conflict.