you can't merge from master into that branch and then call the next thing

1.1.6

though, right?