fix diff conflict