merge 2 error fixes