changed multiplication to incorporate future warning
pointless commit
corrected the merge error