adjusts in battle
merge automatic
merge automatic