Merge error fix.