RE: [WikiEN-l] Re: Resolution of conflicts