notify-send
ri.vim plugin
remove left over merge artifact