add git-merge-into method
moar snippets
actually highlight the current line