14a 2>>>>>>> 3 3. 44a 5<<<<<<< 2 6New line 7======= 8. 93a 10||||||| 2 11which multiple lines 12and a few typos to fix 13======= 14and a few typ0s to fix 15>>>>>>> 3 16. 171a 18<<<<<<< 1 19. 20