adding fork me on github link
resolving merge conflict