adding updates to meetings page
fixed merge conflict