fix for autorunning scripts
fixing merge conflict