Fix the Merge error