Merge error fix