jbudd run output
fixed merge conflicts