merge error fix