fix marquee, selection
merge resolution