first commit
second commit
X

xXWj

G
^X

asdsdf

asdfj
Merge remote-tracking branch 'upstream/master'

Just a merge