Fixed and simplified reload-conflict code with the new change-tracking system.