remove conflicts in csv