updated sample.txt
fixed conflict