20020923 edit-page: Resolving Conflict