update before merge