simplified the line for calculation
simplified the line for calculation
fix merge conflict