Initialize
First commit of user2
added second line
write new line with conflict
merge
added new file
added 5th line
Merge branch 'master' of c:/Users/bonnc/work/gitdemo/server
Merge branch 'master' of https://github.com/bonncherchezuy/gitdemo