doing runs
fixed merge conflict