test for conflict by vishal
Merge branch 'master' of https://github.com/amitpatel111/test2