editor updates
merge