conflict resolve and merge

1 job for al-master in 3 minutes and 50 seconds (queued for 1 second)
Name Stage Failure
build-latest-code Latest Build
npm ERR! 
npm ERR! Failed at the zen-base@0.0.1 build script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
ERR! /root/.npm/_logs/2020-09-25T12_28_08_656Z-debug.log
Removing intermediate container 40fcfad437ee
The command '/bin/sh -c npm run build' returned a non-zero code: 1
ERROR: Job failed: exit code 1