fixed bug in run script
fixed merge conflicts