reset history
gerer conflit
generate history type