correct way of git+https
fix conflict
make coveralls