Bitbucket is not stripping the "close branch" change if a merge fails(BB-14115)

Earlier today, a co-worker and I were getting a project in sync and she tried to merge a branch into her default repo. That branch was behind the default repo, but she had selected merge, and checked the "close branch" checkbox.

What ended up happening was that the branch closed, but did not merge (it gave errors that there were conflicts). Now that the branch was closed, it was inaccessible within the bitbucket UI completely.

I was able to pull down the repo to my machine, and in sourcetree manually navigate to the commit, resolve conflicts and merge, but the branch itself was in limbo. I would expect that in bitbucket, if you attempt to merge an out-of-sync branch, it should fail and NOT close the branch.

Thanks!