this is additional file for testing merge
Merge branch 'test_feature'
Merge branch 'master' into test_feature
new changes to the index.html
this is yet another commit in the test feature branch
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/test_feature'