test.txt added to test branch merging.
test text altered.
Test text has been alterer here, different from master.
fixed conflict
removed test file