Pull branch to fix errors