fix conflicts and getBase bug

.gitlab-ci.yml

@@ -17,4 +17,4 @@ buildStatic:
   stage: buildStatic
   script:
     - /usr/local/bin/nsb -s ./src/sscocaller.nim -n sscocaller.nimble -o . -- --d:release --threads:on
-
+    - ls -l ./src