I have a custom style with modifications that I exported from XF 1.0 I upgraded to XF 1.2 and installed the style. I go to Outdated Templates and see all the modified templates with a "Merge Changes" link. Clicking on it gives me the following error: "The custom template is out of date but has been edited more recently than the parent. Merging can only be done by hand." When I try to Automatically Merge Changes, nothing happens. Can someone explain how I can manually merge the changes if it can't be done automatically.