conflicts  nedit
