- Activate smerge mode on conflicts.
- kill-whole-line now on kk chord.