branching starts
made a change in index
testing branch made change in index
new change to master branch
a change to testing branch
testing commit 3
added li to master branch
manually solved between master & testing branches