and simple
conflict fixed