Merge branch 'development'
ps alias was invalid
Merge branch 'master' into development