Update sample.txt
resolved conflict
Modified changes for branch 2