update merge, fixed permission authority