ICC should fix Windies club v country row