Fixing a bug in ConflictTracker.java