reinitialized git repo
fixed merge conflict, social media class