social link changes
conflict resolved