Add WPF app to act as the visible merging tool.
Minor UI changes