Stock merger with Cash to Boot Help

Can someone please help me enter the following example of a stock merge with cash?  I will use round numbers as an example.  

Cost basis of stock I bought in 2015 was 42,000.

In 2016 they did a stock merge where I got 10,000 in cash and 28,000 of the new stock so my original position was a 4,000 loss.

In 2016 it showed the 10,000 on my 1099 which I entered in turbo tax as 10,000 in revenue and 10,000 cost basis with a gain of $0

In 2017 I sold the stock for 33,000.  My 1099B shows Cost as 28,000 with 5,000 gain.

My true total gain after my 4,000 loss at time of merger and the 5,000 gain is 1,000.  How do I enter this into Turbo tax to show the correct 1000 gain with everything considered.