swapping branch aliases
removing the alias
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' into dev