fix travis configs
Fix conflict merge