Server: check expiry
Check expiry
merge