modal appears and disappears on pause/resume
merge conflict resolved