and simple
& simple
confilict fixed