and simple
& simle
conflict fixed