How to enter two K-1s with same FEIN for same tax year

In Oct. ETP L.P. ceased to be a PTP and was taken private and merged with ET L.P.  My 2018 K-1 for ETP (I guess through date of merger) has 2 subsidiaries (ETP and USAC) with separate FEINs and I entered data for each into 2 separate turbo tax K-1s.  I've just received the 2018 K-1 for ET, (I guess from date of merger through end of year) which has 4 subsidiaries, two of which are ETP and USAC and both use the same FEIN after the merger that they did prior to the merger.  How do I deal with this in TT (Deluxe) now that I have K-1s from 2 different 2018 LPs containing financial data for the same FEIN subsidiaries?  Do I (1) prepare one K-1 with arithmetically merged numbers from both ETP and both USAC K-1s for each corresponding box, (2) prepare 2 separate K-1s for ETP and USAC, identifying them in the name section as pre vs. post merger, or (3) do something else?