fix conflict on save and game resume