fixed build solutions
merged the build solutions