Push another round upstream based on Index
Merge branch 'another_branch'
Making a conflict
Making changes
asdfasdf
Merge branch 'master' into another_branch