add permissions
merge