Handle resizes
merge