ading 1 line in test.txt
committing the cleanup test.txt
merging master