Added undo tree
Fixed minor problems with merge