really fix the bug with dojo
add lcov.info to gitignore
fix conflict