merge errors eruit, shader errors erin