merged changes with ed