edited trunk/README.txt 3
resolved Conflict.