I don't remember, Bill.  It's been ages since I had one that overlapped.

But I think you do complete it for 2018.  Because the 2018 return better not be filed before the back-end of the § 1031 has been completed !