cleaned up scripts
fixed merge conflict