Added test.txt for merge tests