AND simple modify system
& simple
confict fixed