Fix failed merge job