correcting the key bindings for resizing
fixing merge conflicts and resizing issues