auto scroll window + remove
merge conflict solved