resolved the merge conflicts
Indentation
Linkedin integration
Merge branch 'linkedin' into it