fix some possible merge errors?