fix conflicts and getBase bug

1 job for v1.0 in 34 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Build Static
passed buildStatic #16736
docker

00:00:34