Merge conflicts solved dev branch is now up to date on scripts