first commit
added text
changed line
changes
merging from origin