Add the ConflictTracker to the main branch