added a check file
added a change made in testBranch
a chenage in master
merge conflict resolved