updated resolution dialog logic