Re: [WikiEN-l] Resolution of conflicts