various fixes
fixed conflicts
added tig keybinding setting