merge editor with development branch