Added alias for Solegraphics build script
Fixed merge conflicts