branch test
AND simple
& simple
conflict fixed

Signed-off-by: KISSMonX <omonkerman@foxmail.com>