wtf merge errors