Yes, I should have mentioned this is for tax year 2016 so both were filed timely for 2016.  Thank you for your answer.  In years gone by (many) I would attach just about everything I could think of.  Now days I pretty much stick to the forms that have changed, so will go that route.  Just the two into one thing that I found confusing.