initial struct
conflict resolve