Merging [blah] branch in a single commit