and simple
mammm
confict fixed