fix base url conflict.
CONFLICTS CLAY