changes to testing
merge testing.txt