Add links to Twitter and GitHub
Resolve merge conflict