3a
=======
and a few typ0s to fix
>>>>>>> 3
.
1a
<<<<<<< 1
.