fixed conflict bewteen Kyle and Ben test.txt documents