updated build process
fixed merge and build errors