Fixed duplicate entries in conflict string