Fixed Merge errors Fixed calculation on a specific fight scenario Fixed RoundTimer Fixed forced unwrap on boost nil object