3d line S
conflict manual S