They have had things patched up for some time now.
Someone should tell 1/3 of the people on this website.