Please add git merge conflict ligature

[adinvadim]

<<<<<<< HEAD
    <link type="text/css" rel="stylesheet" media="all" href="style.css" />
=======
    <!-- no style -->
>>>>>>> master

Now it's looks not so good
https://www.dropbox.com/s/gkbddo1r50vyhg3/Screenshot%202016-04-20%2019.53.21.png?dl=0

[suy]

This is a duplicate of #49.

[surma]

@adinvadim Can you close this in favor of #49?