We have 2 polyhedral (i.e., solids with polygonal faces), all of whose edges have length 1: a pyramid with a square base, and a tetrahedron (a tetrahedron is composed of 4 triangular faces). Suppose we glue the 2 polyhedral together along a triangular face (so that the attached faces exactly overlap). How many faces does the new solid have?