modify authorize
merge conflict