At some point before the View/Add window opens all conflicts will be resolved. To give yourself a warm fuzzy that you did everything correctly, check the calendar view on the Bid Line Processing option in VIPS. That calendar will show what will happen to your line once all of your conflicts are resolved.