work towards getting individual note expiration working
fix merge conflict