merge to fix errors