oops merge comment
update permissions feature