Make sure to check whether any of the encounter templates (as well as other files) have had any changes made to them since you branched...