Fixed a merge conflict on burn-and-bubble.