featurel test
& simple
conflict fixed
fen zhi ce lue
merge with no-ff