Merge commit from master!
Merge commit from master again