added exponent function
fixed merge conflict