<<<<<<< foo.java
1 Chuck2
=======
1 Chuck1
>>>>>>> 1.10
1 scratch1
2
3
4
5
6
7
8
9
10
11
12
13
14
15