first try
Merge remote-tracking branch 'origin/master'
first try
xww second try
third try
dev change it
dev try again
master doing it
dev did it
merge dev
rollback
release 1.1.0
master changes