fix resizing
fix conflict