Added my GitHub profile link
Fixed a merge conflict