Corrected the merge and trying to get the build process parallel.