added html-editors
added html-editors
fixed conflicts