Fixed merge conflicts and added better user join/leave toasts