Fixed error due to failed merge