changed Join Us text
resolved conflict