added a bunch of lines
added another line
3 commits ahead
merge - conflicts resolved by git add <file>
added results of straightforward merge