update social popup
merge conflict in data
clean up
change again to fit new dataset