made some changes
merged new editor