Name Mapping Merge Improvements

Can anyone report out if Name Mapping Merging has been fixed or improved in 11? Our team is growing but the struggles are growing faster. For now, we've disabled automatic naming and only created aliases for heavily used, poorly named objects created by DevExpress and require the designers to manually repeat the mapping on the test server.

We've looked into using other techniques/tools for merging but the xml format doesn't lend itself well to this (or I haven't discovered a reliable way to identify conflicts and merge.

I read back over a previous post I made on this topic in march and Marsha_R stated "searching the name mapping for _new" after a merge conflict happens was one approach to identifying the conflictd but "no one wanted to be the dedicated person"