f1
&
conflict fixed
add a new translate
fix-issue-101
merged bug fix 101
111