Coca-Cola and football governing body Fifa appear to have resolved their legal spat after the soft drinks giant was confirmed ...