made minor merge error fixes