token expiration buffer
merge settings