Send notification email when changing permissions to Admin or User
Fix merging conflicts