yay merge errors