fixed the broken email address
updated terre.txt
modified terre.txt
resolved conflict in terre.txt