Deleted WordPad line from editors.md
Fixed merge conflict in editors.md