fix
add list meeting for user
fix conflict