fix conflicts
Merge branch 'master' of https://github.com//netguru-training/social-network