updated for multi-machine build
fixed conflict