//this is new merged file
this is testMerge
Merge branch 'master' of https://github.com/amitanand-jft/testGitHub