Added editor
merge