add new file in dev
merge with no-ff
fix the bug 101
mearge bug fix 101
apply changes