From the Fulfillment Tab of a project, you can resolve conflicts by clicking the 'Action Dots' next to an item and clicking 'Mark as Subrental'.
Now, you can add the number of subrentals and add notes.

The conflict will disappear, and your subrentals will be marked accordingly.

Check out the video below if you need a quick refresher on the fulfillment process.