fix integration test patch conflict