qua entry dialog midified.
merge conflicts