Should we really merge stuff that doesn't quite work yet?