Merge failed warning is *too* sticky

Not sure what actually caused this merge failure, but once the flash message came up, it wouldn't go away, even after refreshing the page, and even after merging the change manually and then refreshing to see it acknowledge that it was, in fact, merged.