<<<<<<< HEAD
two
||||||| merged common ancestors
one
=======
dos
>>>>>>> spanish
