Continued conflict resolution with regards to the etrust.csv file
-