some modification in sample2 index.html
some modifiaction in sample2
conflict is resolved in sample2 index.html