added keybindings for linux and mac
fixed merge conflict