mika_branch1 commit
adding index.html
 modified
updated in master
updating index.html with bracnch2
before merge
branch2 updated
updated index.html again
merged and fixed conflicts"