head tail
conflict resolve