added a list of presidents in presidents.txt
added a line in presidents.txt on the same line that master has a new line on, in an attempt to create a conflict for merge
added a line in presidents.txt
commit after merging. Resolved merge conflict I think
experimenting with merging again
experimenting with merging again
foo() in presidents.txt merged with the line in conflicting branch.