Editor continued
Megred with master
fixed merging error