correcting error of collection
Merge branch 'social_website' into test_server_alt