modify store
conflict solved