Added changes to permissions
Resolved merge conflict