Solved deploy and local conflict, added coverages for travis