Added modulus function
Fixed merge conflict