Is the legal dispute over between Bethesda and Interplay regarding the upcoming MMORPG Fallout Online?

The wikia said this:

"It appears Interplay has reached an agreement with Bethesda. The Fallout Online site now states "Fallout? is a registered trademark of Bethesda Softworks LLC, a ZeniMax Media company, in the U.S. and/or other countries, and is used by Interplay under license from Bethesda Softworks LLC. All Rights Reserved.

When Bethesda was* still in dispute with Interplay..... "

*Past tense.

So, is the legal crap over with?
Can we finally discuss the MMORPG?

Until it is officially over this is a restricted topic. Questions about this should be PMed to a moderator, not asked on the forums.