I use WinMerge to diff out profiles/macro files and merge them if needed