Add in club list page.
Resolve merge conflict.