Now I don’t know what is more embarrassing. Ben deploying the merge conflict or @WIRED not fixing it for hours..