prime modified test.txt
fixed conflict