Tetrahedron + Pyramid
You have regular square and triangular pyramids with same-length sides. If you match two of the faces, how many faces does the resulting solid have?
Five.Two faces are removed from the attachment, and two form a single face.