Merge error fixes