Transition en pacman+gold
Resolve conflict