update coverage config for travis and scrutinizer
fix merge conflicts