fix mergeclash derpage