Serious merge error fixes