The forms that you received are correct.
https://ttlc.intuit.com/replies/7121715
If they are both reporting the same income, then no you should not have both or enter both. Sale of stock would generally be reported on the 1099 B, you should call the company that issued the forms and ask them which one is correct.