#1348 Finish fixing broken tar mission template merges

I'm not sure if this is sufficient to address #1348, but I was able to run through the entire tar mission on my local system without any technical issues.