Fix modification merging
Improve the text editor and other small changes
Merge