Fixed merge issue file was moved to from WPF to common folder.