branch dev test
modify new to NEW and add ---
& feature1
conflict fixed
add merge
merge with no-ff
fix issue101
merge fix issue101