Added content to test.txt file
Additional changes to test.txt
Fixed Conflict for Merging dev_1.0 to master branch