merge error fixes