Fix a bug in ConflictTracker.java