test merge
merge with no-ff
fix bug 01
complete work on dev
conflict fixed