Added merge error fix.