TextMate bundle for highlighting merge conflict markers