update merge errors

so many files...