Fix merge conflict errors with BattleInstitute