prepares for Adam dialog tree

title
fixes merge conflict

title