fixed subtraction error
merge conflict