Thanks for the reply!
I've disabled all of my add-ons to see if they were the problem, however they were not. I do indeed have 2 outdated templates, however when I try to merge them by hand this happens:
https://www.dropbox.com/s/4qs3ho6pkqeaib7/x8113Nj.mp4?dl=0