fix mission template after previous merge undid