merge errors?