fix parse error (merge-o, I think)