AND simple
common modify 1
common modify 2
conflict fixed