doing runs
fixed merge conflicts