hello buddy. info
 The conflict is over.info
Merge branch 'master' of https://github.com/kedesr/helloworld