resize fix
merge