initialize
conflict update