All it took was a discount of $400 million. The bitter brouhaha between LVMH Moët Hennessy Louis Vuitton and American jewelry firm Tiffany & Co. is finally over now that the two parties have agreed to put their differences aside, settle their legal dispute and modify certain terms of their merger agreement. Under the new…