Fixed the failed merge