Resolving conflict.
committing and pushing to the master.
Merge branch 'master' of https://github.com/kapilkashyap/kapil-test.git