added behavior for join messages
merged conflicts