And Simole
& simple
conflict fixed