simple add
add some lib
add some libs
merge the test.txt with origin/dev
a merge with dev