added exponent operator
fixed the indentation error
fixed the merge conflict