Minor bug fix in ConflictTracker.java