merge with no-ff
fix bug 101
merged bug fix 101
bug test
fix bug 101
merged bug fix 101
conflicts
add val.txt