added feature editor, print changes
merge