Fix Social Sharing errors
Fix merge conflicts