added news, invite a friend, and send us
conflict resolved