Add fixed travis
Add fixed travis
Add fixed travis
Add fixed travis
Add fixed travis
Add fixed travis
Add fixed travis
Add fixed travis
Add fixed travis
V
Conf
Fixed conflict
Fixed logs
Merge branch 'd2'