Fixed broken Travis due to merge conlict