new resizer
merge conflict solved