stashed from master into string branch
Merge branch 'string' into develop
Checked stashing succsessfully