remove optional suite keys *before* checking for baseline conflicts