Making script work
merge conflcits