fixed authorizations
merged conflicts