blending a local revision with the new code from alt dev server