third line
fourth line
resolve conflicts
Merge pull request #3 from ckclark/master

third line