fixed leave or join logic and datetimepicker max
merge conflict