fix merging derp and add a build script