Don’t be a git: know Git
<ul> <li>Brachiosaurus</li> <li>Stegosaurus</li> <<<<<<< add-new-herbivore <li>Triceratops</li> ======= <li>Ankylosaurus</li> >>>>>>> master </ul>
