Fix the merge. Be more lax. Go back to spans again.