horizontal alignment
Changed keybinding for set-window-hscroll
Conflict resolution