Fix the problem build failse after merging