So I'm going through templates and manually resolving the conflicts that couldn't be automatically rectified, but when I click Merge Changes on some templates to go in and see the conflicts, I get this error:
The custom template is out of date but has been edited more recently than the parent...