Fix Travis config after merge conflict.