Resolved merge conflict in edit access callback