Updated build script to run as a standalone.
Fixing conflicts