added local line 3 in billyboy but from root of simplegit
resolve merge conflict in billyboy.txt