Corrected some bracketing errors from conflict merge.