hi. i can't find a bug tracker, so... in paper.pdf i can read information about auto resolving conflict in chapter 1.1.1 and not in 3.4.6. also, in 3.4.6 there is no reference to 1.1.1. can you fix it? thanks Daniele -- PGP Key-ID: 0xF482D454 -- to boldly go where no man has gone before.