You have a regular tetrahedron and a square pyramid with all edges of equal length. If you were to put a triangular face of the regular tetrahedron and the square pyramid together, how many sides would the resulting figure have?

(In case you're asking, no, there is no trick behind the words that you have to look out for. Just answer the question at face value.)