Editor updates
Merging