Fix some dodgy documentation.
Pass the correct file handle through to the conflict handler.
Version bump.