added some manuals
add info manual
fix conflict