Luis edited paul.txt
Resolved conflict on paul.txt