Fix Merge error