first commit
secondCommit
Merge branch 'first'
Merge branch 'first'
fixed conflict
asa
fixed merged conflict