and simple
& simple
confict fixed