update before possible merge...