updating .sh scripts
settling merge conflict