fix conflict
merge
conflict v2
merge upstream
merge upstream
merge upstream
retain selection when scrolling

Fixed overwriting the text when scrolling while in the middle of a
selection