fix errors after merge