master first change
this is feature change
this is master change
confilict fixed
add the third line
merge the dev with no-ff
fix bug