merge capability token timestamp fix