chore(ci): fix merge conflict from github
chore(ci): fix merge conflict from github

valor-software/ngx-bootstrap,valor-software/ng2-bootstrap,valor-software/ngx-bootstrap,valor-software/ng2-bootstrap,valor-software/ngx-bootstrap,valor-software/ngx-bootstrap