update view choose and fight
resolution conflit