recovering from the git fiasco
Make link for user nick
Fix merge conflicts